sunxacml-commit — Notifications of cvs commits appear on this list

[Sunxacml-commit] sunxacml/com/sun/xacml/ctx InputParser.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16496/com/sun/xacml/ctx

Modified Files:
	InputParser.java 
Log Message:
made the parser namespace-aware in all cases


Index: InputParser.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/InputParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InputParser.java	17 Mar 2004 18:03:39 -0000	1.2
--- InputParser.java	12 May 2004 21:23:44 -0000	1.3
***************
*** 125,131 ****
              DocumentBuilder builder = null;
  
              if (ipReference == null) {
                  // we're not validating
-                 factory.setNamespaceAware(false);
                  factory.setValidating(false);
  
--- 125,133 ----
              DocumentBuilder builder = null;
  
+             // as of 1.2, we always are namespace aware
+             factory.setNamespaceAware(true);
+ 
              if (ipReference == null) {
                  // we're not validating
                  factory.setValidating(false);
  
***************
*** 133,137 ****
              } else {
                  // we are validating
-                 factory.setNamespaceAware(true);
                  factory.setValidating(true);
  
--- 135,138 ----

[Sunxacml-commit] sunxacml/com/sun/xacml/attr AttributeSelector.java,1.6,1.7

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26623/com/sun/xacml/attr

Modified Files:
	AttributeSelector.java 
Log Message:
updated to use the new, correct EvaluationCtx interface


Index: AttributeSelector.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeSelector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AttributeSelector.java	17 Mar 2004 18:03:38 -0000	1.6
--- AttributeSelector.java	6 May 2004 21:10:35 -0000	1.7
***************
*** 46,51 ****
  import com.sun.xacml.ctx.Status;
  
- import com.sun.xacml.finder.AttributeFinder;
- 
  import java.io.OutputStream;
  import java.io.PrintStream;
--- 46,49 ----
***************
*** 61,69 ****
  /**
   * Supports the standard selector functionality in XACML, which uses XPath
!  * expressions to resolve values from the Request or elsewhere. Unlike
!  * the designator class, which does the Request search and then passes off
!  * control to the <code>AttributeFinder</code>, all selector queries are
!  * done by <code>AttributeFinderModule</code>s so that it's easy to plugin
!  * different XPath implementations.
   *
   * @since 1.0
--- 59,65 ----
  /**
   * Supports the standard selector functionality in XACML, which uses XPath
!  * expressions to resolve values from the Request or elsewhere. All selector
!  * queries are done by <code>AttributeFinderModule</code>s so that it's easy
!  * to plugin different XPath implementations.
   *
   * @since 1.0
***************
*** 237,250 ****
       */
      public EvaluationResult evaluate(EvaluationCtx context) {
!         AttributeFinder finder = context.getAttributeFinder();
!         
!         if (finder == null) {
!             // if we're not using a finder, then we can't find anything
!             return new EvaluationResult(BagAttribute.createEmptyBag(type));
!         }
!         
!         // call the finder
!         EvaluationResult result = finder.findAttribute(contextPath, type,
!                                                        context, xpathVersion);
  
          // see if we got anything
--- 233,239 ----
       */
      public EvaluationResult evaluate(EvaluationCtx context) {
!         // query the context
!         EvaluationResult result = context.getAttribute(contextPath, type,
!                                                        xpathVersion);
  
          // see if we got anything

[Sunxacml-commit] sunxacml/com/sun/xacml PDP.java,1.6,1.7

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30603/com/sun/xacml

Modified Files:
	PDP.java 
Log Message:
updated to use EvaluationCtx interface, added an evaluate(EvaluationCtx), and
deprecated evaluate(InputStream)


Index: PDP.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDP.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PDP.java	30 Apr 2004 18:04:00 -0000	1.6
--- PDP.java	3 May 2004 18:34:36 -0000	1.7
***************
*** 98,103 ****
  
      /**
!      * Attempts to evaluate a request against the policies known to this
!      * PDP. This is really the core method of the entire XACML specification.
       * Note that if the request is somehow invalid (it was missing a required
       * attribute, it was using an unsupported scope, etc), then the result
--- 98,107 ----
  
      /**
!      * Attempts to evaluate the request against the policies known to this
!      * PDP. This is really the core method of the entire XACML specification,
!      * and for most people will provide what you want. If you need any special
!      * handling, you should look at the version of this method that takes an
!      * <code>EvaluationCtx</code>.
!      * <p>
       * Note that if the request is somehow invalid (it was missing a required
       * attribute, it was using an unsupported scope, etc), then the result
***************
*** 109,121 ****
       */
      public ResponseCtx evaluate(RequestCtx request) {
-         EvaluationCtx context = null;
-         
          // try to create the EvaluationCtx out of the request
          try {
!             context = new EvaluationCtx(request, attributeFinder);
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return
              // Indeterminate with a status of syntax error...though this
!             // may change is a more appropriate status type exists
              ArrayList code = new ArrayList();
              code.add(Status.STATUS_SYNTAX_ERROR);
--- 113,123 ----
       */
      public ResponseCtx evaluate(RequestCtx request) {
          // try to create the EvaluationCtx out of the request
          try {
!             return evaluate(new BasicEvaluationCtx(request, attributeFinder));
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return
              // Indeterminate with a status of syntax error...though this
!             // may change if a more appropriate status type exists
              ArrayList code = new ArrayList();
              code.add(Status.STATUS_SYNTAX_ERROR);
***************
*** 123,131 ****
  
              return new ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                               status,
!                                               context.getResourceId().
!                                               encode()));
          }
  
          // see if we need to call the resource finder
          if (context.getScope() != EvaluationCtx.SCOPE_IMMEDIATE) {
--- 125,147 ----
  
              return new ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                               status));
          }
+     }
  
+     /**
+      * Uses the given <code>EvaluationCtx</code> against the available
+      * policies to determine a response. If you are starting with a standard
+      * XACML Request, then you should use the version of this method that
+      * takes a <code>RequestCtx</code>. This method should be used only if
+      * you have a real need to directly construct an evaluation context (or
+      * if you need to use an <code>EvaluationCtx</code> implementation other
+      * than <code>BasicEvaluationCtx</code>).
+      *
+      * @param context representation of the request and the context used 
+      *                for evaluation
+      *
+      * @return a response based on the contents of the context
+      */
+     public ResponseCtx evaluate(EvaluationCtx context) {
          // see if we need to call the resource finder
          if (context.getScope() != EvaluationCtx.SCOPE_IMMEDIATE) {
***************
*** 231,234 ****
--- 247,256 ----
       * then this will always return a decision of INDETERMINATE.
       *
+      * @deprecated As of 1.2 this method should not be used. Instead, you
+      *             should do your own stream handling, and then use one of
+      *             the other <code>evaluate</code> methods. The problem
+      *             with this method is that it often doesn't handle stream
+      *             termination correctly (eg, with sockets).
+      *
       * @param input a stream that contains an XML RequestType
       *

[Sunxacml-commit] sunxacml/com/sun/xacml BasicEvaluationCtx.java,NONE,1.1 EvaluationCtx.java,1.6,1.7

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434/com/sun/xacml

Modified Files:
	EvaluationCtx.java 
Added Files:
	BasicEvaluationCtx.java 
Log Message:
re-factored so it's easier to create new kinds of evaluation contexts


--- NEW FILE: BasicEvaluationCtx.java ---

/*
 * @(#)BasicEvaluationCtx.java
 *
 * Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 *   1. Redistribution of source code must retain the above copyright notice,
 *      this list of conditions and the following disclaimer.
 * 
 *   2. Redistribution in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
 *
 * Neither the name of Sun Microsystems, Inc. or the names of contributors may
 * be used to endorse or promote products derived from this software without
 * specific prior written permission.
 * 
 * This software is provided "AS IS," without a warranty of any kind. ALL
 * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING
 * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
 * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MICROSYSTEMS, INC. ("SUN")
 * AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE
 * AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS
 * DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST
 * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
 * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY
 * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
 * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 *
 * You acknowledge that this software is not designed or intended for use in
 * the design, construction, operation or maintenance of any nuclear facility.
 */

package com.sun.xacml;

import com.sun.xacml.attr.AttributeDesignator;
import com.sun.xacml.attr.AttributeValue;
import com.sun.xacml.attr.BagAttribute;
import com.sun.xacml.attr.DateAttribute;
import com.sun.xacml.attr.DateTimeAttribute;
import com.sun.xacml.attr.StringAttribute;
import com.sun.xacml.attr.TimeAttribute;

import com.sun.xacml.cond.EvaluationResult;

import com.sun.xacml.ctx.Attribute;
import com.sun.xacml.ctx.RequestCtx;
import com.sun.xacml.ctx.Status;
import com.sun.xacml.ctx.Subject;

import com.sun.xacml.finder.AttributeFinder;

import java.net.URI;
import java.net.URISyntaxException;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.w3c.dom.Node;


/**
 * A basic implementation of <code>EvaluationCtx</code> that is created from
 * an XACML Request and falls back on an AttributeFinder if a requested
 * value isn't available in the Request.
 *
 * @since 1.2
 * @author Seth Proctor
 */
public class BasicEvaluationCtx implements EvaluationCtx
{
    // the finder to use if a value isn't in the request
    private AttributeFinder finder;

    // the DOM root the original RequestContext document
    private Node requestRoot;

    // the 4 maps that contain the attribute data
    private HashMap subjectMap;
    private HashMap resourceMap;
    private HashMap actionMap;
    private HashMap environmentMap;

    // the resource and its scope
    private AttributeValue resourceId;
    private int scope;

    // the cached current date, time, and datetime, which we may or may
    // not be using depending on how this object was constructed
    private DateAttribute currentDate;
    private TimeAttribute currentTime;
    private DateTimeAttribute currentDateTime;
    private boolean useCachedEnvValues;

    /**
     * Constructs a new <code>BasicEvaluationCtx</code> based on the given
     * request. The resulting context will cache current date, time, and
     * dateTime values so they remain constant for this evaluation.
     *
     * @param request the request
     *
     * @throws ParsingException if a required attribute is missing, or if there
     *                          are any problems dealing with the request data
     */
    public BasicEvaluationCtx(RequestCtx request) throws ParsingException {
        this(request, null, true);
    }

    /**
     * Constructs a new <code>BasicEvaluationCtx</code> based on the given
     * request.
     *
     * @param request the request
     * @param cacheEnvValues whether or not to cache the current time, date,
     *                       and dateTime so they are constant for the scope
     *                       of this evaluation
     *
     * @throws ParsingException if a required attribute is missing, or if there
     *                          are any problems dealing with the request data
     */
    public BasicEvaluationCtx(RequestCtx request, boolean cacheEnvValues)
        throws ParsingException
    {
        this(request, null, cacheEnvValues);
    }

    /**
     * Constructs a new <code>BasicEvaluationCtx</code> based on the given
     * request, and supports looking outside the original request for attribute
     * values using the <code>AttributeFinder</code>. The resulting context
     * will cache current date, time, and dateTime values so they remain
     * constant for this evaluation.
     *
     * @param request the request
     * @param finder an <code>AttributeFinder</code> to use in looking for
     *               attributes that aren't in the request
     *
     * @throws ParsingException if a required attribute is missing, or if there
     *                          are any problems dealing with the request data
     */
    public BasicEvaluationCtx(RequestCtx request, AttributeFinder finder)
        throws ParsingException
    {
        this(request, finder, true);
    }

    /**
     * Constructs a new <code>BasicEvaluationCtx</code> based on the given
     * request, and supports looking outside the original request for attribute
     * values using the <code>AttributeFinder</code>.
     *
     * @param request the request
     * @param finder an <code>AttributeFinder</code> to use in looking for
     *               attributes that aren't in the request
     * @param cacheEnvValues whether or not to cache the current time, date,
     *                       and dateTime so they are constant for the scope
     *                       of this evaluation
     *
     * @throws ParsingException if a required attribute is missing, or if there
     *                          are any problems dealing with the request data
     */
    public BasicEvaluationCtx(RequestCtx request, AttributeFinder finder,
                              boolean cacheEnvValues) throws ParsingException {
        // keep track of the finder
        this.finder = finder;

        // remember the root of the DOM tree for XPath queries
        requestRoot = request.getDocumentRoot();

        // initialize the cached date/time values so it's clear we haven't
        // retrieved them yet
        this.useCachedEnvValues = cacheEnvValues;
        currentDate = null;
        currentTime = null;
        currentDateTime = null;

        // get the subjects, make sure they're correct, and setup tables
        subjectMap = new HashMap();
        setupSubjects(request.getSubjects());

        // next look at the Resource data, which needs to be handled specially
        resourceMap = new HashMap();
        setupResource(request.getResource());
        
        // setup the action data, which is generic
        actionMap = new HashMap();
        mapAttributes(request.getAction(), actionMap);

        // finally, set up the environment data, which is also generic
        environmentMap = new HashMap();
        mapAttributes(request.getEnvironmentAttributes(), environmentMap);
    }

    /**
     * This is quick helper function to provide a little structure for the
     * subject attributes so we can search for them (somewhat) quickly. The
     * basic idea is to have a map indexed by SubjectCategory that keeps
     * Maps that in turn are indexed by id and keep the unique ctx.Attribute
     * objects.
     */
    private void setupSubjects(Set subjects) throws ParsingException {
        // make sure that there is at least one Subject
        if (subjects.size() == 0)
            throw new ParsingException("Request must a contain subject");

        // now go through the subject attributes
        Iterator it = subjects.iterator();
        while (it.hasNext()) {
            Subject subject = (Subject)(it.next());

            URI category = subject.getCategory();
            Map categoryMap = null;

            // see if we've already got a map for the category
            if (subjectMap.containsKey(category)) {
                categoryMap = (Map)(subjectMap.get(category));
            } else {
                categoryMap = new HashMap();
                subjectMap.put(category, categoryMap);
            }

            // iterate over the set of attributes
            Iterator attrIterator = subject.getAttributes().iterator();

            while (attrIterator.hasNext()) {
                Attribute attr = (Attribute)(attrIterator.next());
                String id = attr.getId().toString();

                if (categoryMap.containsKey(id)) {
                    // add to the existing set of Attributes w/this id
                    Set existingIds = (Set)(categoryMap.get(id));
                    existingIds.add(attr);
                } else {
                    // this is the first Attr w/this id
                    HashSet newIds = new HashSet();
                    newIds.add(attr);
                    categoryMap.put(id, newIds);
                }
            }
        }
    }

    /**
     * This basically does the same thing that the other types need
     * to do, except that we also look for a resource-id attribute, not
     * because we're going to use, but only to make sure that it's actually
     * there, and for the optional scope attribute, to see what the scope
     * of the attribute is
     */
    private void setupResource(Set resource) throws ParsingException {
        mapAttributes(resource, resourceMap);

        // make sure there resource-id attribute was included
        if (! resourceMap.containsKey(RESOURCE_ID)) {
            System.err.println("Resource must contain resource-id attr");
            throw new ParsingException("resource missing resource-id");
        } else {
            // make sure there's only one value for this
            Set set = (Set)(resourceMap.get(RESOURCE_ID));
            if (set.size() > 1) {
                System.err.println("Resource may contain only one " +
                                   "resource-id Attribute");
                throw new ParsingException("too many resource-id attrs");
            } else {
                // keep track of the resource-id attribute
                resourceId = ((Attribute)(set.iterator().next())).getValue();
            }
        }

        // see if a resource-scope attribute was included
        if (resourceMap.containsKey(RESOURCE_SCOPE)) {
            Set set = (Set)(resourceMap.get(RESOURCE_SCOPE));

            // make sure there's only one value for resource-scope
            if (set.size() > 1) {
                System.err.println("Resource may contain only one " +
                                   "resource-scope Attribute");
                throw new ParsingException("too many resource-scope attrs");
            }

            Attribute attr = (Attribute)(set.iterator().next());
            AttributeValue attrValue = attr.getValue();

            // scope must be a string, so throw an exception otherwise
            if (! attrValue.getType().toString().
                equals(StringAttribute.identifier))
                throw new ParsingException("scope attr must be a string");

            String value = ((StringAttribute)attrValue).getValue();
            
            if (value.equals("Immediate")) {
                scope = SCOPE_IMMEDIATE;
            } else if (value.equals("Children")) {
                scope = SCOPE_CHILDREN;
            } else if (value.equals("Descendants")) {
                scope = SCOPE_DESCENDANTS;
            } else {
                System.err.println("Unknown scope type: " + value);
                throw new ParsingException("invalid scope type: " + value);
            }
        } else {
            // by default, the scope is always Immediate
            scope = SCOPE_IMMEDIATE;
        }
    }

    /**
     * Generic routine for resource, attribute and environment attributes
     * to build the lookup map for each. The Form is a Map that is indexed
     * by the String form of the attribute ids, and that contains Sets at
     * each entry with all attributes that have that id
     */
    private void mapAttributes(Set input, Map output) {
        Iterator it = input.iterator();
        while (it.hasNext()) {
            Attribute attr = (Attribute)(it.next());
            String id = attr.getId().toString();

            if (output.containsKey(id)) {
                Set set = (Set)(output.get(id));
                set.add(attr);
            } else {
                Set set = new HashSet();
                set.add(attr);
                output.put(id, set);
            }
        }
    }

    /**
     * Returns the <code>AttributeFinder</code> used by this context. Note
     * that this is a deprecated method and will be removed in the next
     * major release.
     *
     * @return the <code>AttributeFinder</code>
     */
    public AttributeFinder getAttributeFinder() {
        return finder;
    }

    /**
     * Returns the DOM root of the original RequestType XML document.
     *
     * @return the DOM root node
     */
    public Node getRequestRoot() {
        return requestRoot;
    }

    /**
     * Returns the resource named in the request as resource-id.
     *
     * @return the resource
     */
    public AttributeValue getResourceId() {
        return resourceId;
    }

    /**
     * Returns the resource scope of the request, which will be one of the
     * three fields denoting Immediate, Children, or Descendants.
     *
     * @return the scope of the resource in the request
     */
    public int getScope() {
        return scope;
    }

    /**
     * Changes the value of the resource-id attribute in this context. This
     * is useful when you have multiple resources (ie, a scope other than
     * IMMEDIATE), and you need to keep changing only the resource-id to
     * evaluate the different effective requests.
     *
     * @param resourceId the new resource-id value
     */
    public void setResourceId(AttributeValue resourceId) {
        this.resourceId = resourceId;

        // there will always be exactly one value for this attribute
        Set attrSet = (Set)(resourceMap.get(RESOURCE_ID));
        Attribute attr = (Attribute)(attrSet.iterator().next());
        
        // remove the old value...
        attrSet.remove(attr);

        // ...and insert the new value
        attrSet.add(new Attribute(attr.getId(), attr.getIssuer(),
                                  attr.getIssueInstant(), resourceId));
    }

    /**
     * Returns the cached value for the current time. If The value has never
     * been set by a call to <code>setCurrentTime</code>, or if caching is
     * not enabled in this instance, then this will return null. Note that this
     * only applies to dynamically resolved values, not those supplied in the
     * Request.
     *
     * @return the current time or null
     */
    public TimeAttribute getCurrentTime() {
        return currentTime;
    }

    /**
     * Sets the current time for this evaluation. If caching is not enabled
     * for this instance then the value is ignored.
     *
     * @param currentTime the dynamically resolved current time
     */
    public void setCurrentTime(TimeAttribute currentTime) {
        if (useCachedEnvValues)
            this.currentTime = currentTime;
    }

    /**
     * Returns the cached value for the current date. If The value has never
     * been set by a call to <code>setCurrentDate</code>, or if caching is
     * not enabled in this instance, then this will return null. Note that this
     * only applies to dynamically resolved values, not those supplied in the
     * Request.
     *
     * @return the current date or null
     */
    public DateAttribute getCurrentDate() {
        return currentDate;
    }

    /**
     * Sets the current date for this evaluation. If caching is not enabled
     * for this instance then the value is ignored.
     *
     * @param currentDate the dynamically resolved current date
     */
    public void setCurrentDate(DateAttribute currentDate) {
        if (useCachedEnvValues)
            this.currentDate = currentDate;
    }

    /**
     * Returns the cached value for the current dateTime. If The value has
     * never been set by a call to <code>setCurrentDateTime</code>, or if
     * caching is not enabled in this instance, then this will return null.
     * Note that this only applies to dynamically resolved values, not those
     * supplied in the Request.
     *
     * @return the current date or null
     */
    public DateTimeAttribute getCurrentDateTime() {
        return currentDateTime;
    }

    /**
     * Sets the current dateTime for this evaluation. If caching is not enabled
     * for this instance then the value is ignored.
     *
     * @param currentDateTime the dynamically resolved current dateTime
     */
    public void setCurrentDateTime(DateTimeAttribute currentDateTime) {
        if (useCachedEnvValues)
            this.currentDateTime = currentDateTime;
    }

    /**
     * Returns attribute value(s) from the subject section of the request
     * that have no issuer.
     *
     * @param type the type of the attribute value(s) to find
     * @param id the id of the attribute value(s) to find
     * @param category the category the attribute value(s) must be in
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getSubjectAttribute(URI type, URI id,
                                                URI category) {
        return getSubjectAttribute(type, id, null, category);
    }

    /**
     * Returns attribute value(s) from the subject section of the request.
     *
     * @param type the type of the attribute value(s) to find
     * @param id the id of the attribute value(s) to find
     * @param issuer the issuer of the attribute value(s) to find or null
     * @param category the category the attribute value(s) must be in
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getSubjectAttribute(URI type, URI id, URI issuer,
                                                URI category) {
        // This is the same as the other three lookups except that this
        // has an extra level of indirection that needs to be handled first
        Map map = (Map)(subjectMap.get(category));

        if (map == null) {
            // the request didn't have that category, so we should try asking
            // the attribute finder
            return callHelper(type, id, issuer, category,
                              AttributeDesignator.SUBJECT_TARGET);
        }
        
        return getGenericAttributes(type, id, issuer, map, category,
                                    AttributeDesignator.SUBJECT_TARGET);
    }
    
    /**
     * Returns attribute value(s) from the resource section of the request.
     *
     * @param type the type of the attribute value(s) to find
     * @param id the id of the attribute value(s) to find
     * @param issuer the issuer of the attribute value(s) to find or null
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getResourceAttribute(URI type, URI id,
                                                 URI issuer) {
        return getGenericAttributes(type, id, issuer, resourceMap, null,
                                    AttributeDesignator.RESOURCE_TARGET);
    }

    /**
     * Returns attribute value(s) from the action section of the request.
     *
     * @param type the type of the attribute value(s) to find
     * @param id the id of the attribute value(s) to find
     * @param issuer the issuer of the attribute value(s) to find or null
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getActionAttribute(URI type, URI id, URI issuer) {
        return getGenericAttributes(type, id, issuer, actionMap, null,
                                    AttributeDesignator.ACTION_TARGET);
    }

    /**
     * Returns attribute value(s) from the environment section of the request.
     *
     * @param type the type of the attribute value(s) to find
     * @param id the id of the attribute value(s) to find
     * @param issuer the issuer of the attribute value(s) to find or null
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getEnvironmentAttribute(URI type, URI id,
                                                    URI issuer) {
        return getGenericAttributes(type, id, issuer, environmentMap, null,
                                    AttributeDesignator.ENVIRONMENT_TARGET);
    }

    /**
     * Helper function for the resource, action and environment methods
     * to get an attribute.
     */
    private EvaluationResult getGenericAttributes(URI type, URI id, URI issuer,
                                                  Map map, URI category,
                                                  int designatorType) {
        // try to find the id
        Set attrSet = (Set)(map.get(id.toString()));
        if (attrSet == null) {
            // the request didn't have an attribute with that id, so we should
            // try asking the attribute finder
            return callHelper(type, id, issuer, category, designatorType);
        }

        // now go through each, considering each Attribute object
        List attributes = new ArrayList();
        Iterator it = attrSet.iterator();

        while (it.hasNext()) {
            Attribute attr = (Attribute)(it.next());

            // make sure the type and issuer are correct
            if ((attr.getType().equals(type)) &&
                ((issuer == null) ||
                 ((attr.getIssuer() != null) &&
                  (attr.getIssuer().equals(issuer.toString()))))) {

                // if we got here, then we found a match, so we want to pull
                // out the values and put them in out list
                attributes.add(attr.getValue());
            }
        }

        // see if we found any acceptable attributes
        if (attributes.size() == 0) {
            // we failed to find any that matched the type/issuer, or all the
            // Attribute types were empty...so ask the finder
            return callHelper(type, id, issuer, category, designatorType);
        }
                
        // if we got here, then we found at least one useful AttributeValue
        return new EvaluationResult(new BagAttribute(type, attributes));
    }

    /**
     * Private helper that calls the finder if it's non-null, or else returns
     * an empty bag
     */
    private EvaluationResult callHelper(URI type, URI id, URI issuer,
                                        URI category, int adType) {
        if (finder != null)
            return finder.findAttribute(type, id, issuer, category,
                                        this, adType);
        else
            return new EvaluationResult(BagAttribute.createEmptyBag(type));
    }

    /**
     * Returns the attribute value(s) retrieved using the given XPath
     * expression.
     *
     * @param contextPath the XPath expression to search
     * @param type the type of the attribute value(s) to find
     * @param xpathVersion the version of XPath to use
     *
     * @return a result containing a bag either empty because no values were
     * found or containing at least one value, or status associated with an
     * Indeterminate result
     */
    public EvaluationResult getAttribute(String contextPath, URI type,
                                         String xpathVersion) {
        return finder.findAttribute(contextPath, type, this, xpathVersion);
    }

}

Index: EvaluationCtx.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/EvaluationCtx.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EvaluationCtx.java	17 Mar 2004 18:03:37 -0000	1.6
--- EvaluationCtx.java	3 May 2004 18:33:35 -0000	1.7
***************
*** 37,67 ****
  package com.sun.xacml;
  
- import com.sun.xacml.attr.AttributeDesignator;
  import com.sun.xacml.attr.AttributeValue;
- import com.sun.xacml.attr.BagAttribute;
  import com.sun.xacml.attr.DateAttribute;
  import com.sun.xacml.attr.DateTimeAttribute;
- import com.sun.xacml.attr.StringAttribute;
  import com.sun.xacml.attr.TimeAttribute;
  
  import com.sun.xacml.cond.EvaluationResult;
  
- import com.sun.xacml.ctx.Attribute;
- import com.sun.xacml.ctx.RequestCtx;
- import com.sun.xacml.ctx.Status;
- import com.sun.xacml.ctx.Subject;
- 
  import com.sun.xacml.finder.AttributeFinder;
  
  import java.net.URI;
- import java.net.URISyntaxException;
- 
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.HashSet;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
  
  import org.w3c.dom.Node;
--- 37,50 ----
***************
*** 69,75 ****
  
  /**
!  * Manages the context of a single policy evaluation. An instance of this
!  * class is typically instantiated whenever the PDP gets a request and
!  * needs to perform an evaluation as a result.
   * <p>
   * Note that this class does some optional caching for current date, time,
--- 52,58 ----
  
  /**
!  * Manages the context of a single policy evaluation. Typically, an instance
!  * is instantiated whenever the PDP gets a request and needs to perform an
!  * evaluation as a result.
   * <p>
   * Note that this class does some optional caching for current date, time,
***************
*** 86,90 ****
   * @author Seth Proctor
   */
! public class EvaluationCtx
  {
  
--- 69,73 ----
   * @author Seth Proctor
   */
! public interface EvaluationCtx
  {
  
***************
*** 117,415 ****
       */
      public static final int SCOPE_DESCENDANTS = 2;
! 
!     // the finder to use if a value isn't in the request
!     private AttributeFinder finder;
! 
!     // the DOM root the original RequestContext document
!     private Node requestRoot;
! 
!     // the 4 maps that contain the attribute data
!     private HashMap subjectMap;
!     private HashMap resourceMap;
!     private HashMap actionMap;
!     private HashMap environmentMap;
! 
!     // the resource and its scope
!     private AttributeValue resourceId;
!     private int scope;
! 
!     // the cached current date, time, and datetime, which we may or may
!     // not be using depending on how this object was constructed
!     private DateAttribute currentDate;
!     private TimeAttribute currentTime;
!     private DateTimeAttribute currentDateTime;
!     private boolean useCachedEnvValues;
! 
!     /**
!      * Constructs a new <code>EvaluationCtx</code> based on the given
!      * request. The resulting context will cache current date, time, and
!      * dateTime values so they remain constant for this evaluation.
!      *
!      * @param request the request
!      *
!      * @throws ParsingException if a required attribute is missing, or if there
!      *                          are any problems dealing with the request data
!      */
!     public EvaluationCtx(RequestCtx request) throws ParsingException {
!         this(request, null, true);
!     }
! 
!     /**
!      * Constructs a new <code>EvaluationCtx</code> based on the given
!      * request.
!      *
!      * @param request the request
!      * @param cacheEnvValues whether or not to cache the current time, date,
!      *                       and dateTime so they are constant for the scope
!      *                       of this evaluation
!      *
!      * @throws ParsingException if a required attribute is missing, or if there
!      *                          are any problems dealing with the request data
!      */
!     public EvaluationCtx(RequestCtx request, boolean cacheEnvValues)
!         throws ParsingException
!     {
!         this(request, null, cacheEnvValues);
!     }
! 
!     /**
!      * Constructs a new <code>EvaluationCtx</code> based on the given
!      * request, and supports looking outside the original request for attribute
!      * values using the <code>AttributeFinder</code>. The resulting context
!      * will cache current date, time, and dateTime values so they remain
!      * constant for this evaluation.
!      *
!      * @param request the request
!      * @param finder an <code>AttributeFinder</code> to use in looking for
!      *               attributes that aren't in the request
!      *
!      * @throws ParsingException if a required attribute is missing, or if there
!      *                          are any problems dealing with the request data
!      */
!     public EvaluationCtx(RequestCtx request, AttributeFinder finder)
!         throws ParsingException
!     {
!         this(request, finder, true);
!     }
! 
!     /**
!      * Constructs a new <code>EvaluationCtx</code> based on the given
!      * request, and supports looking outside the original request for attribute
!      * values using the <code>AttributeFinder</code>.
!      *
!      * @param request the request
!      * @param finder an <code>AttributeFinder</code> to use in looking for
!      *               attributes that aren't in the request
!      * @param cacheEnvValues whether or not to cache the current time, date,
!      *                       and dateTime so they are constant for the scope
!      *                       of this evaluation
!      *
!      * @throws ParsingException if a required attribute is missing, or if there
!      *                          are any problems dealing with the request data
!      */
!     public EvaluationCtx(RequestCtx request, AttributeFinder finder,
!                          boolean cacheEnvValues) throws ParsingException {
!         // keep track of the finder
!         this.finder = finder;
! 
!         // remember the root of the DOM tree for XPath queries
!         requestRoot = request.getDocumentRoot();
! 
!         // initialize the cached date/time values so it's clear we haven't
!         // retrieved them yet
!         this.useCachedEnvValues = cacheEnvValues;
!         currentDate = null;
!         currentTime = null;
!         currentDateTime = null;
! 
!         // get the subjects, make sure they're correct, and setup tables
!         subjectMap = new HashMap();
!         setupSubjects(request.getSubjects());
! 
!         // next look at the Resource data, which needs to be handled specially
!         resourceMap = new HashMap();
!         setupResource(request.getResource());
!         
!         // setup the action data, which is generic
!         actionMap = new HashMap();
!         mapAttributes(request.getAction(), actionMap);
! 
!         // finally, set up the environment data, which is also generic
!         environmentMap = new HashMap();
!         mapAttributes(request.getEnvironmentAttributes(), environmentMap);
!     }
! 
!     /**
!      * This is quick helper function to provide a little structure for the
!      * subject attributes so we can search for them (somewhat) quickly. The
!      * basic idea is to have a map indexed by SubjectCategory that keeps
!      * Maps that in turn are indexed by id and keep the unique ctx.Attribute
!      * objects.
!      */
!     private void setupSubjects(Set subjects) throws ParsingException {
!         // make sure that there is at least one Subject
!         if (subjects.size() == 0)
!             throw new ParsingException("Request must a contain subject");
! 
!         // now go through the subject attributes
!         Iterator it = subjects.iterator();
!         while (it.hasNext()) {
!             Subject subject = (Subject)(it.next());
! 
!             URI category = subject.getCategory();
!             Map categoryMap = null;
! 
!             // see if we've already got a map for the category
!             if (subjectMap.containsKey(category)) {
!                 categoryMap = (Map)(subjectMap.get(category));
!             } else {
!                 categoryMap = new HashMap();
!                 subjectMap.put(category, categoryMap);
!             }
! 
!             // iterate over the set of attributes
!             Iterator attrIterator = subject.getAttributes().iterator();
! 
!             while (attrIterator.hasNext()) {
!                 Attribute attr = (Attribute)(attrIterator.next());
!                 String id = attr.getId().toString();
! 
!                 if (categoryMap.containsKey(id)) {
!                     // add to the existing set of Attributes w/this id
!                     Set existingIds = (Set)(categoryMap.get(id));
!                     existingIds.add(attr);
!                 } else {
!                     // this is the first Attr w/this id
!                     HashSet newIds = new HashSet();
!                     newIds.add(attr);
!                     categoryMap.put(id, newIds);
!                 }
!             }
!         }
!     }
! 
!     /**
!      * This basically does the same thing that the other types need
!      * to do, except that we also look for a resource-id attribute, not
!      * because we're going to use, but only to make sure that it's actually
!      * there, and for the optional scope attribute, to see what the scope
!      * of the attribute is
!      */
!     private void setupResource(Set resource) throws ParsingException {
!         mapAttributes(resource, resourceMap);
! 
!         // make sure there resource-id attribute was included
!         if (! resourceMap.containsKey(RESOURCE_ID)) {
!             System.err.println("Resource must contain resource-id attr");
!             throw new ParsingException("resource missing resource-id");
!         } else {
!             // make sure there's only one value for this
!             Set set = (Set)(resourceMap.get(RESOURCE_ID));
!             if (set.size() > 1) {
!                 System.err.println("Resource may contain only one " +
!                                    "resource-id Attribute");
!                 throw new ParsingException("too many resource-id attrs");
!             } else {
!                 // keep track of the resource-id attribute
!                 resourceId = ((Attribute)(set.iterator().next())).getValue();
!             }
!         }
! 
!         // see if a resource-scope attribute was included
!         if (resourceMap.containsKey(RESOURCE_SCOPE)) {
!             Set set = (Set)(resourceMap.get(RESOURCE_SCOPE));
! 
!             // make sure there's only one value for resource-scope
!             if (set.size() > 1) {
!                 System.err.println("Resource may contain only one " +
!                                    "resource-scope Attribute");
!                 throw new ParsingException("too many resource-scope attrs");
!             }
! 
!             Attribute attr = (Attribute)(set.iterator().next());
!             AttributeValue attrValue = attr.getValue();
! 
!             // scope must be a string, so throw an exception otherwise
!             if (! attrValue.getType().toString().
!                 equals(StringAttribute.identifier))
!                 throw new ParsingException("scope attr must be a string");
! 
!             String value = ((StringAttribute)attrValue).getValue();
!             
!             if (value.equals("Immediate")) {
!                 scope = SCOPE_IMMEDIATE;
!             } else if (value.equals("Children")) {
!                 scope = SCOPE_CHILDREN;
!             } else if (value.equals("Descendants")) {
!                 scope = SCOPE_DESCENDANTS;
!             } else {
!                 System.err.println("Unknown scope type: " + value);
!                 throw new ParsingException("invalid scope type: " + value);
!             }
!         } else {
!             // by default, the scope is always Immediate
!             scope = SCOPE_IMMEDIATE;
!         }
!     }
! 
!     /**
!      * Generic routine for resource, attribute and environment attributes
!      * to build the lookup map for each. The Form is a Map that is indexed
!      * by the String form of the attribute ids, and that contains Sets at
!      * each entry with all attributes that have that id
!      */
!     private void mapAttributes(Set input, Map output) {
!         Iterator it = input.iterator();
!         while (it.hasNext()) {
!             Attribute attr = (Attribute)(it.next());
!             String id = attr.getId().toString();
! 
!             if (output.containsKey(id)) {
!                 Set set = (Set)(output.get(id));
!                 set.add(attr);
!             } else {
!                 Set set = new HashSet();
!                 set.add(attr);
!                 output.put(id, set);
!             }
!         }
!     }
! 
      /**
       * Returns the <code>AttributeFinder</code> used by this context.
       *
       * @return the <code>AttributeFinder</code>
       */
!     public AttributeFinder getAttributeFinder() {
!         return finder;
!     }
  
      /**
!      * Returns the DOM root of the original RequestType XML document.
       *
       * @return the DOM root node
       */
!     public Node getRequestRoot() {
!         return requestRoot;
!     }
  
      /**
!      * Returns the resource named in the request as resource-id.
       *
       * @return the resource
       */
!     public AttributeValue getResourceId() {
!         return resourceId;
!     }
  
      /**
!      * Returns the resource scope of the request, which will be one of the
!      * three fields denoting Immediate, Children, or Descendants.
       *
!      * @return the scope of the resource in the request
       */
!     public int getScope() {
!         return scope;
!     }
  
      /**
--- 100,141 ----
       */
      public static final int SCOPE_DESCENDANTS = 2;
!     
      /**
       * Returns the <code>AttributeFinder</code> used by this context.
       *
+      * @deprecated As of version 1.2, this method should not be used, as it
+      *             provides access to a mutable interface. This method will
+      *             be removed in the next major release.
+      *
       * @return the <code>AttributeFinder</code>
       */
!     public AttributeFinder getAttributeFinder();
  
      /**
!      * Returns the DOM root of the original RequestType XML document, if
!      * this context is backed by an XACML Request. If this context is not
!      * backed by an XML representation, then an exception is thrown.
       *
       * @return the DOM root node
+      *
+      * @throws UnsupportedOperationException if the context is not backed
+      *                                       by an XML representation
       */
!     public Node getRequestRoot();
  
      /**
!      * Returns the identifier for the resource being requested.
       *
       * @return the resource
       */
!     public AttributeValue getResourceId();
  
      /**
!      * Returns the resource scope, which will be one of the three fields
!      * denoting Immediate, Children, or Descendants.
       *
!      * @return the scope of the resource
       */
!     public int getScope();
  
      /**
***************
*** 421,451 ****
       * @param resourceId the new resource-id value
       */
!     public void setResourceId(AttributeValue resourceId) {
!         this.resourceId = resourceId;
! 
!         // there will always be exactly one value for this attribute
!         Set attrSet = (Set)(resourceMap.get(RESOURCE_ID));
!         Attribute attr = (Attribute)(attrSet.iterator().next());
!         
!         // remove the old value...
!         attrSet.remove(attr);
! 
!         // ...and insert the new value
!         attrSet.add(new Attribute(attr.getId(), attr.getIssuer(),
!                                   attr.getIssueInstant(), resourceId));
!     }
  
      /**
!      * Returns the cached value for the current time. If The value has never
       * been set by a call to <code>setCurrentTime</code>, or if caching is
!      * not enabled in this instance, then this will return null. Note that this
!      * only applies to dynamically resolved values, not those supplied in the
!      * Request.
       *
       * @return the current time or null
       */
!     public TimeAttribute getCurrentTime() {
!         return currentTime;
!     }
  
      /**
--- 147,160 ----
       * @param resourceId the new resource-id value
       */
!     public void setResourceId(AttributeValue resourceId);
  
      /**
!      * Returns the cached value for the current time. If the value has never
       * been set by a call to <code>setCurrentTime</code>, or if caching is
!      * not enabled in this instance, then this will return null.
       *
       * @return the current time or null
       */
!     public TimeAttribute getCurrentTime();
  
      /**
***************
*** 455,475 ****
       * @param currentTime the dynamically resolved current time
       */
!     public void setCurrentTime(TimeAttribute currentTime) {
!         if (useCachedEnvValues)
!             this.currentTime = currentTime;
!     }
  
      /**
!      * Returns the cached value for the current date. If The value has never
       * been set by a call to <code>setCurrentDate</code>, or if caching is
!      * not enabled in this instance, then this will return null. Note that this
!      * only applies to dynamically resolved values, not those supplied in the
!      * Request.
       *
       * @return the current date or null
       */
!     public DateAttribute getCurrentDate() {
!         return currentDate;
!     }
  
      /**
--- 164,177 ----
       * @param currentTime the dynamically resolved current time
       */
!     public void setCurrentTime(TimeAttribute currentTime);
  
      /**
!      * Returns the cached value for the current date. If the value has never
       * been set by a call to <code>setCurrentDate</code>, or if caching is
!      * not enabled in this instance, then this will return null.
       *
       * @return the current date or null
       */
!     public DateAttribute getCurrentDate();
  
      /**
***************
*** 479,499 ****
       * @param currentDate the dynamically resolved current date
       */
!     public void setCurrentDate(DateAttribute currentDate) {
!         if (useCachedEnvValues)
!             this.currentDate = currentDate;
!     }
  
      /**
!      * Returns the cached value for the current dateTime. If The value has never
!      * been set by a call to <code>setCurrentDateTime</code>, or if caching is
!      * not enabled in this instance, then this will return null. Note that this
!      * only applies to dynamically resolved values, not those supplied in the
!      * Request.
       *
       * @return the current date or null
       */
!     public DateTimeAttribute getCurrentDateTime() {
!         return currentDateTime;
!     }
  
      /**
--- 181,194 ----
       * @param currentDate the dynamically resolved current date
       */
!     public void setCurrentDate(DateAttribute currentDate);
  
      /**
!      * Returns the cached value for the current dateTime. If the value has
!      * never been set by a call to <code>setCurrentDateTime</code>, or if
!      * caching is not enabled in this instance, then this will return null.
       *
       * @return the current date or null
       */
!     public DateTimeAttribute getCurrentDateTime();
  
      /**
***************
*** 503,514 ****
       * @param currentDateTime the dynamically resolved current dateTime
       */
!     public void setCurrentDateTime(DateTimeAttribute currentDateTime) {
!         if (useCachedEnvValues)
!             this.currentDateTime = currentDateTime;
!     }
  
      /**
!      * Returns attribute value(s) from the subject section of the request
!      * without worrying about the issuer of the attribute.
       *
       * @param type the type of the attribute value(s) to find
--- 198,205 ----
       * @param currentDateTime the dynamically resolved current dateTime
       */
!     public void setCurrentDateTime(DateTimeAttribute currentDateTime);
  
      /**
!      * Returns available subject attribute value(s) ignoring the issuer.
       *
       * @param type the type of the attribute value(s) to find
***************
*** 521,534 ****
       */
      public EvaluationResult getSubjectAttribute(URI type, URI id,
!                                                 URI category) {
!         return getSubjectAttribute(type, id, null, category);
!     }
  
      /**
!      * Returns attribute value(s) from the subject section of the request.
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find
       * @param category the category the attribute value(s) must be in
       *
--- 212,223 ----
       */
      public EvaluationResult getSubjectAttribute(URI type, URI id,
!                                                 URI category);
  
      /**
!      * Returns available subject attribute value(s).
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find or null
       * @param category the category the attribute value(s) must be in
       *
***************
*** 538,563 ****
       */
      public EvaluationResult getSubjectAttribute(URI type, URI id, URI issuer,
!                                                 URI category) {
!         // This is the same as the other three lookups except that this
!         // has an extra level of indirection that needs to be handled first
!         Map map = (Map)(subjectMap.get(category));
! 
!         if (map == null) {
!             // the request didn't have that category, so we should try asking
!             // the attribute finder
!             return callHelper(type, id, issuer, category,
!                               AttributeDesignator.SUBJECT_TARGET);
!         }
!         
!         return getGenericAttributes(type, id, issuer, map, category,
!                                     AttributeDesignator.SUBJECT_TARGET);
!     }
      
      /**
!      * Returns attribute value(s) from the resource section of the request.
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find
       *
       * @return a result containing a bag either empty because no values were
--- 227,238 ----
       */
      public EvaluationResult getSubjectAttribute(URI type, URI id, URI issuer,
!                                                 URI category);
      
      /**
!      * Returns available resource attribute value(s).
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find or null
       *
       * @return a result containing a bag either empty because no values were
***************
*** 566,580 ****
       */
      public EvaluationResult getResourceAttribute(URI type, URI id,
!                                                  URI issuer) {
!         return getGenericAttributes(type, id, issuer, resourceMap, null,
!                                     AttributeDesignator.RESOURCE_TARGET);
!     }
  
      /**
!      * Returns attribute value(s) from the action section of the request.
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find
       *
       * @return a result containing a bag either empty because no values were
--- 241,252 ----
       */
      public EvaluationResult getResourceAttribute(URI type, URI id,
!                                                  URI issuer);
  
      /**
!      * Returns available action attribute value(s).
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find or null
       *
       * @return a result containing a bag either empty because no values were
***************
*** 582,596 ****
       * Indeterminate result
       */
!     public EvaluationResult getActionAttribute(URI type, URI id, URI issuer) {
!         return getGenericAttributes(type, id, issuer, actionMap, null,
!                                     AttributeDesignator.ACTION_TARGET);
!     }
  
      /**
!      * Returns attribute value(s) from the environment section of the request.
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find
       *
       * @return a result containing a bag either empty because no values were
--- 254,265 ----
       * Indeterminate result
       */
!     public EvaluationResult getActionAttribute(URI type, URI id, URI issuer);
  
      /**
!      * Returns available environment attribute value(s).
       *
       * @param type the type of the attribute value(s) to find
       * @param id the id of the attribute value(s) to find
!      * @param issuer the issuer of the attribute value(s) to find or null
       *
       * @return a result containing a bag either empty because no values were
***************
*** 599,664 ****
       */
      public EvaluationResult getEnvironmentAttribute(URI type, URI id,
!                                                     URI issuer) {
!         return getGenericAttributes(type, id, issuer, environmentMap, null,
!                                     AttributeDesignator.ENVIRONMENT_TARGET);
!     }
! 
!     /**
!      * Helper function for the resource, action and environment methods
!      * to get an attribute.
!      */
!     private EvaluationResult getGenericAttributes(URI type, URI id, URI issuer,
!                                                   Map map, URI category,
!                                                   int designatorType) {
!         // try to find the id
!         Set attrSet = (Set)(map.get(id.toString()));
!         if (attrSet == null) {
!             // the request didn't have an attribute with that id, so we should
!             // try asking the attribute finder
!             return callHelper(type, id, issuer, category, designatorType);
!         }
! 
!         // now go through each, considering each Attribute object
!         List attributes = new ArrayList();
!         Iterator it = attrSet.iterator();
! 
!         while (it.hasNext()) {
!             Attribute attr = (Attribute)(it.next());
! 
!             // make sure the type and issuer are correct
!             if ((attr.getType().equals(type)) &&
!                 ((issuer == null) ||
!                  ((attr.getIssuer() != null) &&
!                   (attr.getIssuer().equals(issuer.toString()))))) {
! 
!                 // if we got here, then we found a match, so we want to pull
!                 // out the values and put them in out list
!                 attributes.add(attr.getValue());
!             }
!         }
! 
!         // see if we found any acceptable attributes
!         if (attributes.size() == 0) {
!             // we failed to find any that matched the type/issuer, or all the
!             // Attribute types were empty...so ask the finder
!             return callHelper(type, id, issuer, category, designatorType);
!         }
!                 
!         // if we got here, then we found at least one useful AttributeValue
!         return new EvaluationResult(new BagAttribute(type, attributes));
!     }
  
      /**
!      * Private helper that calls the finder if it's non-null, or else returns
!      * an empty bag
       */
!     private EvaluationResult callHelper(URI type, URI id, URI issuer,
!                                         URI category, int adType) {
!         if (finder != null)
!             return finder.findAttribute(type, id, issuer, category,
!                                         this, adType);
!         else
!             return new EvaluationResult(BagAttribute.createEmptyBag(type));
!     }
  
  }
--- 268,287 ----
       */
      public EvaluationResult getEnvironmentAttribute(URI type, URI id,
!                                                     URI issuer);
  
      /**
!      * Returns the attribute value(s) retrieved using the given XPath
!      * expression.
!      *
!      * @param contextPath the XPath expression to search
!      * @param type the type of the attribute value(s) to find
!      * @param xpathVersion the version of XPath to use
!      *
!      * @return a result containing a bag either empty because no values were
!      * found or containing at least one value, or status associated with an
!      * Indeterminate result
       */
!     public EvaluationResult getAttribute(String contextPath, URI datatype,
!                                          String xpathVersion);
  
  }

[Sunxacml-commit] sunxacml/com/sun/xacml PDP.java,1.5,1.6

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3060/com/sun/xacml

Modified Files:
	PDP.java 
Log Message:
updated to fix a small typo


Index: PDP.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDP.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PDP.java	30 Apr 2004 18:00:19 -0000	1.5
--- PDP.java	30 Apr 2004 18:04:00 -0000	1.6
***************
*** 113,117 ****
          // try to create the EvaluationCtx out of the request
          try {
!             context = new BasicEvaluationCtx(request, attributeFinder);
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return
--- 113,117 ----
          // try to create the EvaluationCtx out of the request
          try {
!             context = new EvaluationCtx(request, attributeFinder);
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return

[Sunxacml-commit] sunxacml/com/sun/xacml PDP.java,1.4,1.5

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2312/com/sun/xacml

Modified Files:
	PDP.java 
Log Message:
updated to use the context-aware methods of ResourceFinder


Index: PDP.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDP.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PDP.java	23 Mar 2004 23:38:51 -0000	1.4
--- PDP.java	30 Apr 2004 18:00:19 -0000	1.5
***************
*** 113,117 ****
          // try to create the EvaluationCtx out of the request
          try {
!             context = new EvaluationCtx(request, attributeFinder);
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return
--- 113,117 ----
          // try to create the EvaluationCtx out of the request
          try {
!             context = new BasicEvaluationCtx(request, attributeFinder);
          } catch (ParsingException pe) {
              // there was something wrong with the request, so we return
***************
*** 134,141 ****
  
              if (context.getScope() == EvaluationCtx.SCOPE_CHILDREN)
!                 resourceResult = resourceFinder.findChildResources(parent);
              else
                  resourceResult =
!                     resourceFinder.findDescendantResources(parent);
  
              // see if we actually found anything
--- 134,142 ----
  
              if (context.getScope() == EvaluationCtx.SCOPE_CHILDREN)
!                 resourceResult =
!                     resourceFinder.findChildResources(parent, context);
              else
                  resourceResult =
!                     resourceFinder.findDescendantResources(parent, context);
  
              // see if we actually found anything

[Sunxacml-commit] sunxacml/com/sun/xacml/finder ResourceFinder.java,1.3,1.4 ResourceFinderModule.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1755/com/sun/xacml/finder

Modified Files:
	ResourceFinder.java ResourceFinderModule.java 
Log Message:
added new interfaces to include context and deprecated the old interfaces


Index: ResourceFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ResourceFinder.java	29 Apr 2004 20:58:41 -0000	1.3
--- ResourceFinder.java	30 Apr 2004 17:56:43 -0000	1.4
***************
*** 37,40 ****
--- 37,42 ----
  package com.sun.xacml.finder;
  
+ import com.sun.xacml.EvaluationCtx;
+ 
  import com.sun.xacml.attr.AttributeValue;
  
***************
*** 59,62 ****
--- 61,74 ----
   * they can handle. So, you must be careful when assigning to ordering of
   * the modules in this finder.
+  * <p>
+  * Note that in release 1.2 the interfaces were updated to include the
+  * evaluation context. In the next major release the interfaces without the
+  * context information will be removed, but for now both exist. This means
+  * that if this finder is called with the context, then only the methods
+  * in <code>ResourceFinderModule</code> supporting the context will be
+  * called (and likewise only the methods without context will be called
+  * when this finder is called without the context). In practice this
+  * means that the methods with context will always get invoked, since this
+  * is what the default PDP implementation calls.
   *
   * @since 1.0
***************
*** 124,127 ****
--- 136,175 ----
       *
       * @param parentResourceId the root of the resources
+      * @param context the representation of the request data
+      *
+      * @return the result of looking for child resources
+      */
+     public ResourceFinderResult findChildResources(AttributeValue
+                                                    parentResourceId,
+                                                    EvaluationCtx context) {
+         Iterator it = childModules.iterator();
+ 
+         while (it.hasNext()) {
+             ResourceFinderModule module = (ResourceFinderModule)(it.next());
+ 
+             // ask the module to find the resources
+             ResourceFinderResult result =
+                 module.findChildResources(parentResourceId, context);
+ 
+             // if we found something, then always return that result
+             if (! result.isEmpty())
+                 return result;
+         }
+ 
+         // no modules applied, so we return an empty result
+         return new ResourceFinderResult();
+     }
+     
+     /**
+      * Finds Resource Ids using the Children scope, and returns all resolved
+      * identifiers as well as any errors that occurred. If no modules can
+      * handle the given Resource Id, then an empty result is returned.
+      *
+      * @deprecated As of version 1.2, replaced by
+      *             {@link #findChildResources(AttributeValue,EvaluationCtx)}.
+      *             This version does not provide the evaluation context to
+      *             the modules, and will be removed in a future release.
+      *
+      * @param parentResourceId the root of the resources
       *
       * @return the result of looking for child resources
***************
*** 146,150 ****
          return new ResourceFinderResult();
      }
!     
      /**
       * Finds Resource Ids using the Descendants scope, and returns all resolved
--- 194,198 ----
          return new ResourceFinderResult();
      }
! 
      /**
       * Finds Resource Ids using the Descendants scope, and returns all resolved
***************
*** 153,160 ****
--- 201,245 ----
       *
       * @param parentResourceId the root of the resources
+      * @param context the representation of the request data
       *
       * @return the result of looking for descendant resources
       */
      public ResourceFinderResult findDescendantResources(AttributeValue
+                                                         parentResourceId,
+                                                         EvaluationCtx
+                                                         context) {
+         Iterator it = descendantModules.iterator();
+ 
+         while (it.hasNext()) {
+             ResourceFinderModule module = (ResourceFinderModule)(it.next());
+ 
+             // ask the module to find the resources
+             ResourceFinderResult result =
+                 module.findDescendantResources(parentResourceId, context);
+ 
+             // if we found something, then always return that result
+             if (! result.isEmpty())
+                 return result;
+         }
+ 
+         // no modules applied, so we return an empty result
+         return new ResourceFinderResult();
+     }
+ 
+     /**
+      * Finds Resource Ids using the Descendants scope, and returns all resolved
+      * identifiers as well as any errors that occurred. If no modules can
+      * handle the given Resource Id, then an empty result is returned.
+      *
+      * @deprecated As of version 1.2, replaced by
+      *          {@link #findDescendantResources(AttributeValue,EvaluationCtx)}.
+      *             This version does not provide the evaluation context to
+      *             the modules, and will be removed in a future release.
+      *
+      * @param parentResourceId the root of the resources
+      *
+      * @return the result of looking for child resources
+      */
+     public ResourceFinderResult findDescendantResources(AttributeValue
                                                          parentResourceId) {
          Iterator it = descendantModules.iterator();

Index: ResourceFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinderModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceFinderModule.java	17 Mar 2004 18:03:39 -0000	1.2
--- ResourceFinderModule.java	30 Apr 2004 17:56:43 -0000	1.3
***************
*** 37,40 ****
--- 37,42 ----
  package com.sun.xacml.finder;
  
+ import com.sun.xacml.EvaluationCtx;
+ 
  import com.sun.xacml.attr.AttributeValue;
  
***************
*** 80,83 ****
--- 82,109 ----
       *
       * @param parentResourceId the parent resource identifier
+      * @param context the representation of the request data
+      *
+      * @return the result of finding child resources
+      */
+     public ResourceFinderResult findChildResources(AttributeValue
+                                                    parentResourceId,
+                                                    EvaluationCtx context) {
+         return new ResourceFinderResult();
+     }
+ 
+     /**
+      * Tries to find the child Resource Ids associated with the parent. If
+      * this module cannot handle the given identifier, then an empty result is
+      * returned, otherwise the result will always contain at least the
+      * parent Resource Id, either as a successfully resolved Resource Id or an
+      * error case, but never both.
+      *
+      * @deprecated As of version 1.2, replaced by
+      *             {@link #findChildResources(AttributeValue,EvaluationCtx)}.
+      *             This version does not provide the evaluation context,
+      *             and will be removed in a future release. Also, not that
+      *             this will never get called when using the default PDP.
+      *
+      * @param parentResourceId the parent resource identifier
       *
       * @return the result of finding child resources
***************
*** 96,99 ****
--- 122,150 ----
       *
       * @param parentResourceId the parent resource identifier
+      * @param context the representation of the request data
+      *
+      * @return the result of finding descendant resources
+      */
+     public ResourceFinderResult findDescendantResources(AttributeValue
+                                                         parentResourceId,
+                                                         EvaluationCtx
+                                                         context) {
+         return new ResourceFinderResult();
+     }
+ 
+     /**
+      * Tries to find the descendant Resource Ids associated with the parent. If
+      * this module cannot handle the given identifier, then an empty result is
+      * returned, otherwise the result will always contain at least the
+      * parent Resource Id, either as a successfuly resolved Resource Id or an
+      * error case, but never both.
+      *
+      * @deprecated As of version 1.2, replaced by
+      *          {@link #findDescendantResources(AttributeValue,EvaluationCtx)}.
+      *             This version does not provide the evaluation context,
+      *             and will be removed in a future release. Also, not that
+      *             this will never get called when using the default PDP.
+      *
+      * @param parentResourceId the parent resource identifier
       *
       * @return the result of finding descendant resources

[Sunxacml-commit] sunxacml/com/sun/xacml/finder ResourceFinder.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22780/com/sun/xacml/finder

Modified Files:
	ResourceFinder.java 
Log Message:
fixed to use correct list for descendant modules


Index: ResourceFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResourceFinder.java	17 Mar 2004 18:03:39 -0000	1.2
--- ResourceFinder.java	29 Apr 2004 20:58:41 -0000	1.3
***************
*** 158,162 ****
      public ResourceFinderResult findDescendantResources(AttributeValue
                                                          parentResourceId) {
!         Iterator it = childModules.iterator();
  
          while (it.hasNext()) {
--- 158,162 ----
      public ResourceFinderResult findDescendantResources(AttributeValue
                                                          parentResourceId) {
!         Iterator it = descendantModules.iterator();
  
          while (it.hasNext()) {

[Sunxacml-commit] sunxacml/com/sun/xacml ConfigurationStore.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21997/com/sun/xacml

Modified Files:
	ConfigurationStore.java 
Log Message:
updated to use version 0.2 of the schema


Index: ConfigurationStore.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ConfigurationStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigurationStore.java	17 Mar 2004 18:03:37 -0000	1.2
--- ConfigurationStore.java	26 Apr 2004 16:46:18 -0000	1.3
***************
*** 100,104 ****
   * This way, the programmer still has full control over their security model,
   * but also has the convenience of re-using a common configuration
!  * mechanism.
   * <p>
   * Note that becuase this doesn't tie directly into the rest of the code, you
--- 100,105 ----
   * This way, the programmer still has full control over their security model,
   * but also has the convenience of re-using a common configuration
!  * mechanism. See http://sunxacml.sourceforge.net/schama/config-0.2.xsd for
!  * the valid schama.
   * <p>
   * Note that becuase this doesn't tie directly into the rest of the code, you
***************
*** 123,131 ****
          "com.sun.xacml.PDPConfigFile";
  
-     /**
-      * Identifier for the default named elements.
-      */
-     public static final String DEFAULT_IDENTIFIER = "default";
- 
      // pdp elements
      private PDPConfig defaultPDPConfig;
--- 124,127 ----
***************
*** 202,205 ****
--- 198,211 ----
          functionMap = new HashMap();
  
+         // get the default names
+         NamedNodeMap attrs = root.getAttributes();
+         String defaultPDP = attrs.getNamedItem("defaultPDP").getNodeValue();
+         String defaultAF = attrs.getNamedItem("defaultAttributeFactory").
+             getNodeValue();
+         String defaultCAF = attrs.getNamedItem("defaultCombiningAlgFactory").
+             getNodeValue();
+         String defaultFF = attrs.getNamedItem("defaultFunctionFactory").
+             getNodeValue();
+ 
          // loop through all the root-level elements, for each one getting its
          // name and then loading the right kind of element
***************
*** 210,224 ****
              String elementName = null;
  
!             // get the element's name, or default to DEFAULT_IDENTIFIER
!             NamedNodeMap attrMap = child.getAttributes();
!             if (attrMap == null) {
!                 elementName = DEFAULT_IDENTIFIER;
!             } else {
!                 Node attr = attrMap.getNamedItem("name");
!                 if (attr == null)
!                     elementName = DEFAULT_IDENTIFIER;
!                 else
!                     elementName = attr.getNodeValue();
!             }
  
              // see if this is a pdp or a factory, and load accordingly,
--- 216,223 ----
              String elementName = null;
  
!             // get the element's name
!             if (child.getNodeType() == Node.ELEMENT_NODE)
!                 elementName = child.getAttributes().
!                     getNamedItem("name").getNodeValue();
  
              // see if this is a pdp or a factory, and load accordingly,
***************
*** 262,276 ****
          }
  
!         // finally, extract the default elements, if they were specified...
!         // this is done as an optimizaion on the assumption that people will
!         // call the getDefault* methods more than once, but may be removed
!         // if that assumption proves to be incorrect in practice
!         defaultPDPConfig = (PDPConfig)(pdpConfigMap.get(DEFAULT_IDENTIFIER));
          defaultAttributeFactory = (AttributeFactory)
!             (attributeMap.get(DEFAULT_IDENTIFIER));
          defaultCombiningFactory = (CombiningAlgFactory)
!             (combiningMap.get(DEFAULT_IDENTIFIER));
          defaultFunctionFactoryProxy = (FunctionFactoryProxy)
!             (functionMap.get(DEFAULT_IDENTIFIER));
      }
  
--- 261,272 ----
          }
  
!         // finally, extract the default elements
!         defaultPDPConfig = (PDPConfig)(pdpConfigMap.get(defaultPDP));
          defaultAttributeFactory = (AttributeFactory)
!             (attributeMap.get(defaultAF));
          defaultCombiningFactory = (CombiningAlgFactory)
!             (combiningMap.get(defaultCAF));
          defaultFunctionFactoryProxy = (FunctionFactoryProxy)
!             (functionMap.get(defaultFF));
      }
  

[Sunxacml-commit] sunxacml/com/sun/xacml PDP.java,1.3,1.4 PolicyReference.java,1.5,1.6 Rule.java,1.5,1.6

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3936/com/sun/xacml

Modified Files:
	PDP.java PolicyReference.java Rule.java 
Log Message:
changed to always return the resource-id in Results


Index: Rule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Rule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Rule.java	17 Mar 2004 18:03:37 -0000	1.5
--- Rule.java	23 Mar 2004 23:38:51 -0000	1.6
***************
*** 269,283 ****
              // if the target didn't match, then this Rule doesn't apply
              if (result == MatchResult.NO_MATCH)
!                 return new Result(Result.DECISION_NOT_APPLICABLE);
  
              // if the target was indeterminate, we can't go on
              if (result == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus());
          }
  
          // if there's no condition, then we just return the effect...
          if (condition == null)
!             return new Result(effectAttr);
  
          // ...otherwise we evaluate the condition
--- 269,285 ----
              // if the target didn't match, then this Rule doesn't apply
              if (result == MatchResult.NO_MATCH)
!                 return new Result(Result.DECISION_NOT_APPLICABLE,
!                                   context.getResourceId().encode());
  
              // if the target was indeterminate, we can't go on
              if (result == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus(),
!                                   context.getResourceId().encode());
          }
  
          // if there's no condition, then we just return the effect...
          if (condition == null)
!             return new Result(effectAttr, context.getResourceId().encode());
  
          // ...otherwise we evaluate the condition
***************
*** 287,291 ****
              // if it was INDETERMINATE, then that's what we return
              return new Result(Result.DECISION_INDETERMINATE,
!                               result.getStatus());
          } else {
              // otherwise we return the effect on tue, and NA on false
--- 289,294 ----
              // if it was INDETERMINATE, then that's what we return
              return new Result(Result.DECISION_INDETERMINATE,
!                               result.getStatus(),
!                               context.getResourceId().encode());
          } else {
              // otherwise we return the effect on tue, and NA on false
***************
*** 294,300 ****
  
              if (bool.getValue())
!                 return new Result(effectAttr);
              else
!                 return new Result(Result.DECISION_NOT_APPLICABLE);
          }
      }
--- 297,305 ----
  
              if (bool.getValue())
!                 return new Result(effectAttr,
!                                   context.getResourceId().encode());
              else
!                 return new Result(Result.DECISION_NOT_APPLICABLE,
!                                   context.getResourceId().encode());
          }
      }

Index: PDP.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDP.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PDP.java	17 Mar 2004 18:03:37 -0000	1.3
--- PDP.java	23 Mar 2004 23:38:51 -0000	1.4
***************
*** 123,127 ****
  
              return new ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                               status));
          }
  
--- 123,129 ----
  
              return new ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                               status,
!                                               context.getResourceId().
!                                               encode()));
          }
  
***************
*** 148,152 ****
                  return new
                      ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                            new Status(code, msg)));
              }
  
--- 150,155 ----
                  return new
                      ResponseCtx(new Result(Result.DECISION_INDETERMINATE,
!                                            new Status(code, msg),
!                                            context.getResourceId().encode()));
              }
  
***************
*** 204,208 ****
          if (finderResult.notApplicable()) {
              System.err.println("couldn't find an applicable policy");
!             return new Result(Result.DECISION_NOT_APPLICABLE);
          }
  
--- 207,212 ----
          if (finderResult.notApplicable()) {
              System.err.println("couldn't find an applicable policy");
!             return new Result(Result.DECISION_NOT_APPLICABLE,
!                               context.getResourceId().encode());
          }
  
***************
*** 211,215 ****
              System.err.println("error in trying to find top-level policy");
              return new Result(Result.DECISION_INDETERMINATE,
!                               finderResult.getStatus());
          }
  
--- 215,220 ----
              System.err.println("error in trying to find top-level policy");
              return new Result(Result.DECISION_INDETERMINATE,
!                               finderResult.getStatus(),
!                               context.getResourceId().encode());
          }
  

Index: PolicyReference.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PolicyReference.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PolicyReference.java	17 Mar 2004 18:03:37 -0000	1.5
--- PolicyReference.java	23 Mar 2004 23:38:51 -0000	1.6
***************
*** 301,305 ****
          // if there is no finder, then we return NotApplicable
          if (finder == null)
!             return new Result(Result.DECISION_NOT_APPLICABLE);
  
          PolicyFinderResult pfr = finder.findPolicy(reference, policyType);
--- 301,306 ----
          // if there is no finder, then we return NotApplicable
          if (finder == null)
!             return new Result(Result.DECISION_NOT_APPLICABLE,
!                               context.getResourceId().encode());
  
          PolicyFinderResult pfr = finder.findPolicy(reference, policyType);
***************
*** 307,315 ****
          // if we found nothing, then we return NotApplicable
          if (pfr.notApplicable())
!             return new Result(Result.DECISION_NOT_APPLICABLE);
  
          // if there was an error, we return that status data
          if (pfr.indeterminate())
!             return new Result(Result.DECISION_INDETERMINATE, pfr.getStatus());
  
          // we must have found a policy
--- 308,318 ----
          // if we found nothing, then we return NotApplicable
          if (pfr.notApplicable())
!             return new Result(Result.DECISION_NOT_APPLICABLE,
!                               context.getResourceId().encode());
  
          // if there was an error, we return that status data
          if (pfr.indeterminate())
!             return new Result(Result.DECISION_INDETERMINATE, pfr.getStatus(),
!                               context.getResourceId().encode());
  
          // we must have found a policy

[Sunxacml-commit] sunxacml/com/sun/xacml/combine DenyOverridesPolicyAlg.java,1.4,1.5 DenyOverridesRuleAlg.java,1.4,1.5 FirstApplicablePolicyAlg.java,1.3,1.4 FirstApplicableRuleAlg.java,1.3,1.4 OnlyOneApplicablePolicyAlg.java,1.3,1.4 PermitOverridesPolicyAlg.java,1.4,1.5 PermitOverridesRuleAlg.java,1.4,1.5

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3936/com/sun/xacml/combine

Modified Files:
	DenyOverridesPolicyAlg.java DenyOverridesRuleAlg.java 
	FirstApplicablePolicyAlg.java FirstApplicableRuleAlg.java 
	OnlyOneApplicablePolicyAlg.java PermitOverridesPolicyAlg.java 
	PermitOverridesRuleAlg.java 
Log Message:
changed to always return the resource-id in Results


Index: DenyOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/DenyOverridesPolicyAlg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DenyOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.4
--- DenyOverridesPolicyAlg.java	23 Mar 2004 23:38:52 -0000	1.5
***************
*** 127,131 ****
  
              if (match.getResult() == MatchResult.INDETERMINATE)
!                 return new Result(Result.DECISION_DENY);
  
              if (match.getResult() == MatchResult.MATCH) {
--- 127,132 ----
  
              if (match.getResult() == MatchResult.INDETERMINATE)
!                 return new Result(Result.DECISION_DENY,
!                                   context.getResourceId().encode());
  
              if (match.getResult() == MatchResult.MATCH) {
***************
*** 139,142 ****
--- 140,144 ----
                      (effect == Result.DECISION_INDETERMINATE))
                      return new Result(Result.DECISION_DENY,
+                                       context.getResourceId().encode(),
                                        result.getObligations());
                  
***************
*** 151,157 ****
          // if we got a PERMIT, return it, otherwise it's NOT_APPLICABLE
          if (atLeastOnePermit)
!             return new Result(Result.DECISION_PERMIT, permitObligations);
          else
!             return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 153,162 ----
          // if we got a PERMIT, return it, otherwise it's NOT_APPLICABLE
          if (atLeastOnePermit)
!             return new Result(Result.DECISION_PERMIT,
!                               context.getResourceId().encode(),
!                               permitObligations);
          else
!             return new Result(Result.DECISION_NOT_APPLICABLE,
!                               context.getResourceId().encode());
      }
  

Index: FirstApplicableRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/FirstApplicableRuleAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FirstApplicableRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.3
--- FirstApplicableRuleAlg.java	23 Mar 2004 23:38:55 -0000	1.4
***************
*** 117,121 ****
  
          // if we got here, then none of the rules applied
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 117,122 ----
  
          // if we got here, then none of the rules applied
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

Index: FirstApplicablePolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/FirstApplicablePolicyAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FirstApplicablePolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.3
--- FirstApplicablePolicyAlg.java	23 Mar 2004 23:38:55 -0000	1.4
***************
*** 113,117 ****
              if (match.getResult() == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus());
  
              if (match.getResult() == MatchResult.MATCH) {
--- 113,118 ----
              if (match.getResult() == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus(),
!                                   context.getResourceId().encode());
  
              if (match.getResult() == MatchResult.MATCH) {
***************
*** 129,133 ****
  
          // if we got here, then none of the rules applied
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 130,135 ----
  
          // if we got here, then none of the rules applied
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

Index: OnlyOneApplicablePolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OnlyOneApplicablePolicyAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OnlyOneApplicablePolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.3
--- OnlyOneApplicablePolicyAlg.java	23 Mar 2004 23:38:55 -0000	1.4
***************
*** 119,123 ****
              if (result == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus());
              
              if (result == MatchResult.MATCH) {
--- 119,124 ----
              if (result == MatchResult.INDETERMINATE)
                  return new Result(Result.DECISION_INDETERMINATE,
!                                   match.getStatus(),
!                                   context.getResourceId().encode());
              
              if (result == MatchResult.MATCH) {
***************
*** 128,132 ****
                      String message = "Too many applicable policies";
                      return new Result(Result.DECISION_INDETERMINATE,
!                                       new Status(code, message));
                  }
  
--- 129,134 ----
                      String message = "Too many applicable policies";
                      return new Result(Result.DECISION_INDETERMINATE,
!                                       new Status(code, message),
!                                       context.getResourceId().encode());
                  }
  
***************
*** 144,148 ****
  
          // if we didn't find a matching policy, then we don't apply
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 146,151 ----
  
          // if we didn't find a matching policy, then we don't apply
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

Index: PermitOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/PermitOverridesRuleAlg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PermitOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.4
--- PermitOverridesRuleAlg.java	23 Mar 2004 23:38:55 -0000	1.5
***************
*** 160,164 ****
          // we return DENY
          if (atLeastOneDeny)
!             return new Result(Result.DECISION_DENY);
          
          // we didn't find anything that said DENY, but if we had a
--- 160,165 ----
          // we return DENY
          if (atLeastOneDeny)
!             return new Result(Result.DECISION_DENY,
!                               context.getResourceId().encode());
          
          // we didn't find anything that said DENY, but if we had a
***************
*** 169,173 ****
          // if we hit this point, then none of the rules actually applied
          // to us, so we return NOT_APPLICABLE
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 170,175 ----
          // if we hit this point, then none of the rules actually applied
          // to us, so we return NOT_APPLICABLE
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

Index: DenyOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/DenyOverridesRuleAlg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DenyOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.4
--- DenyOverridesRuleAlg.java	23 Mar 2004 23:38:55 -0000	1.5
***************
*** 160,164 ****
          // we return PERMIT
          if (atLeastOnePermit)
!             return new Result(Result.DECISION_PERMIT);
          
          // we didn't find anything that said PERMIT, but if we had a
--- 160,165 ----
          // we return PERMIT
          if (atLeastOnePermit)
!             return new Result(Result.DECISION_PERMIT,
!                               context.getResourceId().encode());
          
          // we didn't find anything that said PERMIT, but if we had a
***************
*** 169,173 ****
          // if we hit this point, then none of the rules actually applied
          // to us, so we return NOT_APPLICABLE
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 170,175 ----
          // if we hit this point, then none of the rules actually applied
          // to us, so we return NOT_APPLICABLE
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

Index: PermitOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/PermitOverridesPolicyAlg.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PermitOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.4
--- PermitOverridesPolicyAlg.java	23 Mar 2004 23:38:55 -0000	1.5
***************
*** 159,171 ****
          // if we got a DENY, return it
          if (atLeastOneDeny)
!             return new Result(Result.DECISION_DENY, denyObligations);
          
          // if we got an INDETERMINATE, return it
          if (atLeastOneError)
              return new Result(Result.DECISION_INDETERMINATE,
!                               firstIndeterminateStatus);
          
          // if we got here, then nothing applied to us
!         return new Result(Result.DECISION_NOT_APPLICABLE);
      }
  
--- 159,175 ----
          // if we got a DENY, return it
          if (atLeastOneDeny)
!             return new Result(Result.DECISION_DENY,
!                               context.getResourceId().encode(),
!                               denyObligations);
          
          // if we got an INDETERMINATE, return it
          if (atLeastOneError)
              return new Result(Result.DECISION_INDETERMINATE,
!                               firstIndeterminateStatus,
!                               context.getResourceId().encode());
          
          // if we got here, then nothing applied to us
!         return new Result(Result.DECISION_NOT_APPLICABLE,
!                           context.getResourceId().encode());
      }
  

[Sunxacml-commit] sunxacml/com/sun/xacml Obligation.java,1.5,1.6

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28919/com/sun/xacml

Modified Files:
	Obligation.java 
Log Message:
Changed assignments from Set to List


Index: Obligation.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Obligation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Obligation.java	17 Mar 2004 18:03:37 -0000	1.5
--- Obligation.java	23 Mar 2004 22:59:48 -0000	1.6
***************
*** 49,55 ****
  import java.net.URISyntaxException;
  
! import java.util.HashSet;
  import java.util.Iterator;
! import java.util.Set;
  
  import org.w3c.dom.NamedNodeMap;
--- 49,55 ----
  import java.net.URISyntaxException;
  
! import java.util.ArrayList;
  import java.util.Iterator;
! import java.util.List;
  
  import org.w3c.dom.NamedNodeMap;
***************
*** 75,90 ****
  
      // the attribute assignments
!     private Set assignments;
  
      /**
       * Constructor that takes all the data associated with an obligation.
!      * The attribute assignment set contains <code>Attribute</code> objects,
       * but only the fields used by the AttributeAssignmentType are used.
       *
       * @param id the obligation's id
       * @param fulfillOn the effect denoting when to fulfill this obligation
!      * @param assignments a set of <code>Attribute</code> objects
       */
!     public Obligation(URI id, int fulfillOn, Set assignments) {
          this.id = id;
          this.fulfillOn = fulfillOn;
--- 75,90 ----
  
      // the attribute assignments
!     private List assignments;
  
      /**
       * Constructor that takes all the data associated with an obligation.
!      * The attribute assignment list contains <code>Attribute</code> objects,
       * but only the fields used by the AttributeAssignmentType are used.
       *
       * @param id the obligation's id
       * @param fulfillOn the effect denoting when to fulfill this obligation
!      * @param assignments a <code>List</code> of <code>Attribute</code>s
       */
!     public Obligation(URI id, int fulfillOn, List assignments) {
          this.id = id;
          this.fulfillOn = fulfillOn;
***************
*** 105,109 ****
          URI id;
          int fulfillOn = -1;
!         Set assignments = new HashSet();
  
          AttributeFactory attrFactory = AttributeFactory.getInstance();
--- 105,109 ----
          URI id;
          int fulfillOn = -1;
!         List assignments = new ArrayList();
  
          AttributeFactory attrFactory = AttributeFactory.getInstance();
***************
*** 180,189 ****
      /**
       * Returns the attribute assignment data in this obligation. The
!      * <code>Set</code> contains objects of type <code>Attribute</code>
       * with only the correct attribute fields being used.
       *
       * @return the assignments
       */
!     public Set getAssignments() {
          return assignments;
      }
--- 180,189 ----
      /**
       * Returns the attribute assignment data in this obligation. The
!      * <code>List</code> contains objects of type <code>Attribute</code>
       * with only the correct attribute fields being used.
       *
       * @return the assignments
       */
!     public List getAssignments() {
          return assignments;
      }

[Sunxacml-commit] sunxacml/com/sun/xacml/cond AbsFunction.java,1.3,1.4 AddFunction.java,1.3,1.4 BagFunction.java,1.3,1.4 ComparisonFunction.java,1.4,1.5 ConditionBagFunction.java,1.2,1.3 ConditionSetFunction.java,1.2,1.3 DateMathFunction.java,1.3,1.4 DivideFunction.java,1.3,1.4 EqualFunction.java,1.4,1.5 FloorFunction.java,1.3,1.4 GeneralBagFunction.java,1.2,1.3 GeneralSetFunction.java,1.2,1.3 HigherOrderFunction.java,1.4,1.5 LogicalFunction.java,1.3,1.4 MapFunction.java,1.3,1.4 MatchFunction.java,1.4,1.5 ModFunction.java,1.3,1.4 MultiplyFunction.java,1.3,1.4 NOfFunction.java,1.3,1.4 NotFunction.java,1.3,1.4 NumericConvertFunction.java,1.3,1.4 RoundFunction.java,1.3,1.4 SetFunction.java,1.3,1.4 StandardFunctionFactory.java,1.3,1.4 StringNormalizeFunction.java,1.3,1.4 SubtractFunction.java,1.3,1.4

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/com/sun/xacml/cond

Modified Files:
	AbsFunction.java AddFunction.java BagFunction.java 
	ComparisonFunction.java ConditionBagFunction.java 
	ConditionSetFunction.java DateMathFunction.java 
	DivideFunction.java EqualFunction.java FloorFunction.java 
	GeneralBagFunction.java GeneralSetFunction.java 
	HigherOrderFunction.java LogicalFunction.java MapFunction.java 
	MatchFunction.java ModFunction.java MultiplyFunction.java 
	NOfFunction.java NotFunction.java NumericConvertFunction.java 
	RoundFunction.java SetFunction.java 
	StandardFunctionFactory.java StringNormalizeFunction.java 
	SubtractFunction.java 
Log Message:
functions report supported identifiers and clusters use these sets


Index: LogicalFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/LogicalFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LogicalFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- LogicalFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 104,107 ****
--- 104,122 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_OR);
+         set.add(NAME_AND);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: ConditionSetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ConditionSetFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConditionSetFunction.java	17 Mar 2004 18:03:38 -0000	1.2
--- ConditionSetFunction.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 158,161 ****
--- 158,181 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         for (int i = 0; i < simpleTypes.length; i++) {
+             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
+ 
+             set.add(baseName + NAME_BASE_AT_LEAST_ONE_MEMBER_OF);
+             set.add(baseName + NAME_BASE_SUBSET);
+             set.add(baseName + NAME_BASE_SET_EQUALS);
+         }
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluates the function, using the specified parameters.
       *

Index: NumericConvertFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NumericConvertFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NumericConvertFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- NumericConvertFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 106,109 ****
--- 106,124 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_DOUBLE_TO_INTEGER);
+         set.add(NAME_INTEGER_TO_DOUBLE);
+ 
+         return set;
+     }
+ 
+     /**
       * Private helper that returns the type used for the given standard
       * function. Note that this doesn't check on the return value since the

Index: GeneralSetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/GeneralSetFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GeneralSetFunction.java	17 Mar 2004 18:03:38 -0000	1.2
--- GeneralSetFunction.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 149,152 ****
--- 149,171 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         for (int i = 0; i < simpleTypes.length; i++) {
+             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
+ 
+             set.add(baseName + NAME_BASE_INTERSECTION);
+             set.add(baseName + NAME_BASE_UNION);
+         }
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluates the function, using the specified parameters.
       *

Index: AddFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/AddFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AddFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- AddFunction.java	18 Mar 2004 21:13:08 -0000	1.4
***************
*** 118,121 ****
--- 118,136 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_ADD);
+         set.add(NAME_DOUBLE_ADD);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: RoundFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/RoundFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RoundFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- RoundFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 83,86 ****
--- 83,100 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_ROUND);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: DateMathFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/DateMathFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DateMathFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- DateMathFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 226,229 ****
--- 226,248 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_DATETIME_ADD_DAYTIMEDURATION);
+         set.add(NAME_DATETIME_SUBTRACT_DAYTIMEDURATION);
+         set.add(NAME_DATETIME_ADD_YEARMONTHDURATION);
+         set.add(NAME_DATETIME_SUBTRACT_YEARMONTHDURATION);
+         set.add(NAME_DATE_ADD_YEARMONTHDURATION);
+         set.add(NAME_DATE_SUBTRACT_YEARMONTHDURATION);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: BagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/BagFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BagFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- BagFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 52,55 ****
--- 52,58 ----
  import com.sun.xacml.attr.YearMonthDurationAttribute;
  
+ import java.util.HashSet;
+ import java.util.Set;
+ 
  
  /**
***************
*** 249,251 ****
--- 252,269 ----
      }
  
+     /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.addAll(ConditionBagFunction.getSupportedIdentifiers());
+         set.addAll(GeneralBagFunction.getSupportedIdentifiers());
+ 
+         return set;
+     }
+ 
  }

Index: MultiplyFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MultiplyFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MultiplyFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- MultiplyFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 118,121 ****
--- 118,136 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_MULTIPLY);
+         set.add(NAME_DOUBLE_MULTIPLY);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: NotFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NotFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NotFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- NotFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 81,84 ****
--- 81,98 ----
                                                 + functionName);
      }
+     
+     /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_NOT);
+ 
+         return set;
+     }
  
      /**

Index: ComparisonFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ComparisonFunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ComparisonFunction.java	17 Mar 2004 18:03:38 -0000	1.4
--- ComparisonFunction.java	18 Mar 2004 21:13:09 -0000	1.5
***************
*** 373,376 ****
--- 373,413 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_GREATER_THAN);
+         set.add(NAME_INTEGER_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_INTEGER_LESS_THAN);
+         set.add(NAME_INTEGER_LESS_THAN_OR_EQUAL);
+         set.add(NAME_DOUBLE_GREATER_THAN);
+         set.add(NAME_DOUBLE_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_DOUBLE_LESS_THAN);
+         set.add(NAME_DOUBLE_LESS_THAN_OR_EQUAL);
+         set.add(NAME_STRING_GREATER_THAN);
+         set.add(NAME_STRING_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_STRING_LESS_THAN);
+         set.add(NAME_STRING_LESS_THAN_OR_EQUAL);
+         set.add(NAME_TIME_GREATER_THAN);
+         set.add(NAME_TIME_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_TIME_LESS_THAN);
+         set.add(NAME_TIME_LESS_THAN_OR_EQUAL);
+         set.add(NAME_DATETIME_GREATER_THAN);
+         set.add(NAME_DATETIME_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_DATETIME_LESS_THAN);
+         set.add(NAME_DATETIME_LESS_THAN_OR_EQUAL);
+         set.add(NAME_DATE_GREATER_THAN);
+         set.add(NAME_DATE_GREATER_THAN_OR_EQUAL);
+         set.add(NAME_DATE_LESS_THAN);
+         set.add(NAME_DATE_LESS_THAN_OR_EQUAL);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: EqualFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/EqualFunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EqualFunction.java	17 Mar 2004 18:03:38 -0000	1.4
--- EqualFunction.java	18 Mar 2004 21:13:09 -0000	1.5
***************
*** 251,254 ****
--- 251,281 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_STRING_EQUAL);
+         set.add(NAME_BOOLEAN_EQUAL);
+         set.add(NAME_INTEGER_EQUAL);
+         set.add(NAME_DOUBLE_EQUAL);
+         set.add(NAME_DATE_EQUAL);
+         set.add(NAME_TIME_EQUAL);
+         set.add(NAME_DATETIME_EQUAL);
+         set.add(NAME_DAYTIME_DURATION_EQUAL);
+         set.add(NAME_YEARMONTH_DURATION_EQUAL);
+         set.add(NAME_ANYURI_EQUAL);
+         set.add(NAME_X500NAME_EQUAL);
+         set.add(NAME_RFC822NAME_EQUAL);
+         set.add(NAME_HEXBINARY_EQUAL);
+         set.add(NAME_BASE64BINARY_EQUAL);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: StringNormalizeFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/StringNormalizeFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringNormalizeFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- StringNormalizeFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 105,108 ****
--- 105,123 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_STRING_NORMALIZE_SPACE);
+         set.add(NAME_STRING_NORMALIZE_TO_LOWER_CASE);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: FloorFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FloorFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FloorFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- FloorFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 84,87 ****
--- 84,101 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_FLOOR);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: NOfFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NOfFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NOfFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- NOfFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 92,95 ****
--- 92,109 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_N_OF);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: SetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/SetFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SetFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- SetFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 56,59 ****
--- 56,62 ----
  import com.sun.xacml.attr.YearMonthDurationAttribute;
  
+ import java.util.HashSet;
+ import java.util.Set;
+ 
  
  /**
***************
*** 255,257 ****
--- 258,275 ----
      }
  
+     /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.addAll(ConditionSetFunction.getSupportedIdentifiers());
+         set.addAll(GeneralSetFunction.getSupportedIdentifiers());
+ 
+         return set;
+     }
+ 
  }

Index: SubtractFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/SubtractFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SubtractFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- SubtractFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 118,121 ****
--- 118,136 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_SUBTRACT);
+         set.add(NAME_DOUBLE_SUBTRACT);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: DivideFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/DivideFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DivideFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- DivideFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 118,121 ****
--- 118,136 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_DIVIDE);
+         set.add(NAME_DOUBLE_DIVIDE);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: HigherOrderFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/HigherOrderFunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HigherOrderFunction.java	17 Mar 2004 18:03:38 -0000	1.4
--- HigherOrderFunction.java	18 Mar 2004 21:13:09 -0000	1.5
***************
*** 179,182 ****
--- 179,201 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_ANY_OF);
+         set.add(NAME_ALL_OF);
+         set.add(NAME_ANY_OF_ANY);
+         set.add(NAME_ALL_OF_ANY);
+         set.add(NAME_ANY_OF_ALL);
+         set.add(NAME_ALL_OF_ALL);
+ 
+         return set;
+     }
+ 
+     /**
       * Returns the full identifier of this function, as known by the factories.
       *

Index: ModFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ModFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ModFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- ModFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 82,85 ****
--- 82,99 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_MOD);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: MatchFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MatchFunction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MatchFunction.java	17 Mar 2004 18:03:38 -0000	1.4
--- MatchFunction.java	18 Mar 2004 21:13:09 -0000	1.5
***************
*** 147,150 ****
--- 147,166 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_REGEXP_STRING_MATCH);
+         set.add(NAME_X500NAME_MATCH);
+         set.add(NAME_RFC822NAME_MATCH);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: GeneralBagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/GeneralBagFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GeneralBagFunction.java	17 Mar 2004 18:03:38 -0000	1.2
--- GeneralBagFunction.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 222,225 ****
--- 222,245 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         for (int i = 0; i < simpleTypes.length; i++) {
+             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
+ 
+             set.add(baseName + NAME_BASE_ONE_AND_ONLY);
+             set.add(baseName + NAME_BASE_BAG_SIZE);
+             set.add(baseName + NAME_BASE_BAG);
+         }
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: AbsFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/AbsFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbsFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- AbsFunction.java	18 Mar 2004 21:13:08 -0000	1.4
***************
*** 118,121 ****
--- 118,136 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_INTEGER_ABS);
+         set.add(NAME_DOUBLE_ABS);
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: StandardFunctionFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/StandardFunctionFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StandardFunctionFactory.java	17 Mar 2004 18:03:38 -0000	1.3
--- StandardFunctionFactory.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 175,179 ****
              try {
                  addAbstractFunction(new MapFunctionProxy(),
!                                     new URI(MapFunction.NAME));
              } catch (URISyntaxException e) {
                  // this shouldn't ever happen, but just in case...
--- 175,179 ----
              try {
                  addAbstractFunction(new MapFunctionProxy(),
!                                     new URI(MapFunction.NAME_MAP));
              } catch (URISyntaxException e) {
                  // this shouldn't ever happen, but just in case...

Index: ConditionBagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ConditionBagFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConditionBagFunction.java	17 Mar 2004 18:03:38 -0000	1.2
--- ConditionBagFunction.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 119,122 ****
--- 119,139 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         for (int i = 0; i < simpleTypes.length; i++) {
+             set.add(FunctionBase.FUNCTION_NS + simpleTypes[i] +
+                     NAME_BASE_IS_IN);
+         }
+ 
+         return set;
+     }
+ 
+     /**
       * Evaluate the function, using the specified parameters.
       *

Index: MapFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MapFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MapFunction.java	17 Mar 2004 18:03:38 -0000	1.3
--- MapFunction.java	18 Mar 2004 21:13:09 -0000	1.4
***************
*** 48,54 ****
--- 48,56 ----
  
  import java.util.ArrayList;
+ import java.util.HashSet;
  import java.util.Iterator;
  import java.util.List;
  import java.util.Map;
+ import java.util.Set;
  
  import org.w3c.dom.Node;
***************
*** 68,72 ****
       * The name of this function
       */
!     public static final String NAME = FunctionBase.FUNCTION_NS + "map";
  
      // the return type for this instance
--- 70,74 ----
       * The name of this function
       */
!     public static final String NAME_MAP = FunctionBase.FUNCTION_NS + "map";
  
      // the return type for this instance
***************
*** 81,85 ****
      static {
          try {
!             identifier = new URI(NAME);
          } catch (Exception e) {
              earlyException = new IllegalArgumentException();
--- 83,87 ----
      static {
          try {
!             identifier = new URI(NAME_MAP);
          } catch (Exception e) {
              earlyException = new IllegalArgumentException();
***************
*** 98,101 ****
--- 100,117 ----
  
      /**
+      * Returns a <code>Set</code> containing all the function identifiers
+      * supported by this class.
+      *
+      * @return a <code>Set</code> of <code>String</code>s
+      */
+     public static Set getSupportedIdentifiers() {
+         Set set = new HashSet();
+ 
+         set.add(NAME_MAP);
+ 
+         return set;
+     }
+ 
+     /**
       * Creates a new instance of the map function using the data found in
       * the DOM node provided. This is called by a proxy when the factory

[Sunxacml-commit] sunxacml/com/sun/xacml/cond/cluster AbsFunctionCluster.java,1.2,1.3 AddFunctionCluster.java,1.2,1.3 ComparisonFunctionCluster.java,1.2,1.3 ConditionBagFunctionCluster.java,1.2,1.3 ConditionSetFunctionCluster.java,1.2,1.3 DateMathFunctionCluster.java,1.2,1.3 DivideFunctionCluster.java,1.2,1.3 EqualFunctionCluster.java,1.2,1.3 FloorFunctionCluster.java,1.2,1.3 GeneralBagFunctionCluster.java,1.2,1.3 GeneralSetFunctionCluster.java,1.2,1.3 HigherOrderFunctionCluster.java,1.2,1.3 LogicalFunctionCluster.java,1.2,1.3 MatchFunctionCluster.java,1.2,1.3 ModFunctionCluster.java,1.2,1.3 MultiplyFunctionCluster.java,1.2,1.3 NOfFunctionCluster.java,1.2,1.3 NotFunctionCluster.java,1.2,1.3 NumericConvertFunctionCluster.java,1.2,1.3 RoundFunctionCluster.java,1.2,1.3 StringNormalizeFunctionCluster.java,1.2,1.3 SubtractFunctionCluster.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/com/sun/xacml/cond/cluster

Modified Files:
	AbsFunctionCluster.java AddFunctionCluster.java 
	ComparisonFunctionCluster.java 
	ConditionBagFunctionCluster.java 
	ConditionSetFunctionCluster.java DateMathFunctionCluster.java 
	DivideFunctionCluster.java EqualFunctionCluster.java 
	FloorFunctionCluster.java GeneralBagFunctionCluster.java 
	GeneralSetFunctionCluster.java HigherOrderFunctionCluster.java 
	LogicalFunctionCluster.java MatchFunctionCluster.java 
	ModFunctionCluster.java MultiplyFunctionCluster.java 
	NOfFunctionCluster.java NotFunctionCluster.java 
	NumericConvertFunctionCluster.java RoundFunctionCluster.java 
	StringNormalizeFunctionCluster.java 
	SubtractFunctionCluster.java 
Log Message:
functions report supported identifiers and clusters use these sets


Index: MatchFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MatchFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MatchFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- MatchFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,61 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new MatchFunction(MatchFunction.NAME_REGEXP_STRING_MATCH));
!         set.add(new MatchFunction(MatchFunction.NAME_X500NAME_MATCH));
!         set.add(new MatchFunction(MatchFunction.NAME_RFC822NAME_MATCH));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = MatchFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new MatchFunction((String)(it.next())));
  
          return set;

Index: DivideFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DivideFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DivideFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- DivideFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new DivideFunction(DivideFunction.NAME_INTEGER_DIVIDE));
!         set.add(new DivideFunction(DivideFunction.NAME_DOUBLE_DIVIDE));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = DivideFunction.getSupportedIdentifiers().iterator();
!         
!         while (it.hasNext())
!             set.add(new DivideFunction((String)(it.next())));
  
          return set;

Index: NOfFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NOfFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NOfFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- NOfFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,59 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new NOfFunction(NOfFunction.NAME_N_OF));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = NOfFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new NOfFunction((String)(it.next())));
  
          return set;

Index: AddFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AddFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- AddFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new AddFunction(AddFunction.NAME_INTEGER_ADD));
!         set.add(new AddFunction(AddFunction.NAME_DOUBLE_ADD));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = AddFunction.getSupportedIdentifiers().iterator();
!         
!         while (it.hasNext())
!             set.add(new AddFunction((String)(it.next())));
  
          return set;

Index: EqualFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/EqualFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EqualFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- EqualFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,73 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new EqualFunction(EqualFunction.NAME_STRING_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_BOOLEAN_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_INTEGER_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_DOUBLE_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_DATE_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_TIME_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_DATETIME_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_DAYTIME_DURATION_EQUAL));
!         set.add(new EqualFunction(EqualFunction.
!                                   NAME_YEARMONTH_DURATION_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_ANYURI_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_X500NAME_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_RFC822NAME_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_HEXBINARY_EQUAL));
!         set.add(new EqualFunction(EqualFunction.NAME_BASE64BINARY_EQUAL));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = EqualFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new EqualFunction((String)(it.next())));
  
          return set;

Index: MultiplyFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MultiplyFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiplyFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- MultiplyFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new MultiplyFunction(MultiplyFunction.NAME_INTEGER_MULTIPLY));
!         set.add(new MultiplyFunction(MultiplyFunction.NAME_DOUBLE_MULTIPLY));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = MultiplyFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new MultiplyFunction((String)(it.next())));
  
          return set;

Index: GeneralSetFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralSetFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GeneralSetFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- GeneralSetFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 41,44 ****
--- 41,45 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 53,78 ****
  {
  
-     /**
-      * A complete list of all the XACML datatypes supported by the Set
-      * functions, using the "simple" form of the names (eg, string
-      * instead of http://www.w3.org/2001/XMLSchema#string)
-      */
-     private static String simpleTypes [] = {
-         "string", "boolean", "integer", "double", "date", "dateTime",
-         "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration",
-         "yearMonthDuration", "x500Name", "rfc822Name"
-     };
- 
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         for (int i = 0; i < simpleTypes.length; i++) {
!             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
! 
!             set.add(new GeneralSetFunction(baseName + GeneralSetFunction.
!                                            NAME_BASE_INTERSECTION));
!             set.add(new GeneralSetFunction(baseName + GeneralSetFunction.
!                                            NAME_BASE_UNION));
!         }
  
          return set;
--- 54,63 ----
  {
  
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = GeneralSetFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new GeneralSetFunction((String)(it.next())));
  
          return set;

Index: StringNormalizeFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/StringNormalizeFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StringNormalizeFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- StringNormalizeFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 55,64 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new StringNormalizeFunction(StringNormalizeFunction.
!                                             NAME_STRING_NORMALIZE_SPACE));
!         set.add(new
!                 StringNormalizeFunction(StringNormalizeFunction.
!                                         NAME_STRING_NORMALIZE_TO_LOWER_CASE));
  
          return set;
--- 56,64 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = StringNormalizeFunction.getSupportedIdentifiers().
!             iterator();
!         
!         while (it.hasNext())
!             set.add(new StringNormalizeFunction((String)(it.next())));
  
          return set;

Index: RoundFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/RoundFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RoundFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- RoundFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,59 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new RoundFunction(RoundFunction.NAME_ROUND));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = RoundFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new RoundFunction((String)(it.next())));
  
          return set;

Index: ConditionBagFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionBagFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConditionBagFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- ConditionBagFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 41,44 ****
--- 41,45 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 53,76 ****
  {
  
-     /**
-      * A complete list of all the XACML datatypes supported by the Set
-      * functions, using the "simple" form of the names (eg, string
-      * instead of http://www.w3.org/2001/XMLSchema#string)
-      */
-     private static String simpleTypes [] = {
-         "string", "boolean", "integer", "double", "date", "dateTime",
-         "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration",
-         "yearMonthDuration", "x500Name", "rfc822Name"
-     };
- 
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         for (int i = 0; i < simpleTypes.length; i++) {
!             set.add(new ConditionBagFunction(FunctionBase.FUNCTION_NS +
!                                              simpleTypes[i] +
!                                              ConditionBagFunction.
!                                              NAME_BASE_IS_IN));
!         }
  
          return set;
--- 54,64 ----
  {
  
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = ConditionBagFunction.getSupportedIdentifiers().
+             iterator();
  
!         while (it.hasNext())
!             set.add(new ConditionBagFunction((String)(it.next())));
  
          return set;

Index: ConditionSetFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionSetFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConditionSetFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- ConditionSetFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 41,44 ****
--- 41,45 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 53,80 ****
  {
  
-     /**
-      * A complete list of all the XACML datatypes supported by the Set
-      * functions, using the "simple" form of the names (eg, string
-      * instead of http://www.w3.org/2001/XMLSchema#string)
-      */
-     private static String simpleTypes [] = {
-         "string", "boolean", "integer", "double", "date", "dateTime",
-         "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration",
-         "yearMonthDuration", "x500Name", "rfc822Name"
-     };
- 
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         for (int i = 0; i < simpleTypes.length; i++) {
!             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
! 
!             set.add(new ConditionSetFunction(baseName + ConditionSetFunction.
!                                            NAME_BASE_AT_LEAST_ONE_MEMBER_OF));
!             set.add(new ConditionSetFunction(baseName + ConditionSetFunction.
!                                              NAME_BASE_SUBSET));
!             set.add(new ConditionSetFunction(baseName + ConditionSetFunction.
!                                              NAME_BASE_SET_EQUALS));
!         }
  
          return set;
--- 54,64 ----
  {
  
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = ConditionSetFunction.getSupportedIdentifiers().
+             iterator();
  
!         while (it.hasNext())
!             set.add(new ConditionSetFunction((String)(it.next())));
  
          return set;

Index: LogicalFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/LogicalFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LogicalFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- LogicalFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new LogicalFunction(LogicalFunction.NAME_OR));
!         set.add(new LogicalFunction(LogicalFunction.NAME_AND));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = LogicalFunction.getSupportedIdentifiers().iterator();
!         
!         while (it.hasNext())
!             set.add(new LogicalFunction((String)(it.next())));
  
          return set;

Index: SubtractFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/SubtractFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SubtractFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- SubtractFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new SubtractFunction(SubtractFunction.NAME_INTEGER_SUBTRACT));
!         set.add(new SubtractFunction(SubtractFunction.NAME_DOUBLE_SUBTRACT));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = SubtractFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new SubtractFunction((String)(it.next())));
  
          return set;

Index: NotFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NotFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NotFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- NotFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,59 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new NotFunction(NotFunction.NAME_NOT));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = NotFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new NotFunction((String)(it.next())));
  
          return set;

Index: DateMathFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DateMathFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DateMathFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- DateMathFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,71 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new DateMathFunction(DateMathFunction.
!                                      NAME_DATETIME_ADD_DAYTIMEDURATION));
!         set.add(new DateMathFunction(DateMathFunction.
!                                      NAME_DATETIME_SUBTRACT_DAYTIMEDURATION));
!         set.add(new DateMathFunction(DateMathFunction.
!                                      NAME_DATETIME_ADD_YEARMONTHDURATION));
!         set.add(new
!                 DateMathFunction(DateMathFunction.
!                                  NAME_DATETIME_SUBTRACT_YEARMONTHDURATION));
!         set.add(new DateMathFunction(DateMathFunction.
!                                      NAME_DATE_ADD_YEARMONTHDURATION));
!         set.add(new DateMathFunction(DateMathFunction.
!                                      NAME_DATE_SUBTRACT_YEARMONTHDURATION));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = DateMathFunction.getSupportedIdentifiers().iterator();
!         
!         while (it.hasNext())
!             set.add(new DateMathFunction((String)(it.next())));
  
          return set;

Index: ModFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ModFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- ModFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,59 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new ModFunction(ModFunction.NAME_INTEGER_MOD));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = ModFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new ModFunction((String)(it.next())));
  
          return set;

Index: HigherOrderFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/HigherOrderFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HigherOrderFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- HigherOrderFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,64 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF));
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF));
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF_ANY));
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF_ANY));
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF_ALL));
!         set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF_ALL));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = HigherOrderFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new HigherOrderFunction((String)(it.next())));
  
          return set;

Index: FloorFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/FloorFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FloorFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- FloorFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,59 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new FloorFunction(FloorFunction.NAME_FLOOR));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = FloorFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new FloorFunction((String)(it.next())));
  
          return set;

Index: ComparisonFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ComparisonFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ComparisonFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- ComparisonFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,106 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_INTEGER_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_INTEGER_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_INTEGER_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_INTEGER_LESS_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DOUBLE_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DOUBLE_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DOUBLE_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DOUBLE_LESS_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_STRING_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_STRING_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_STRING_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_STRING_LESS_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_TIME_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_TIME_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_TIME_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_TIME_LESS_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATETIME_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATETIME_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATETIME_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATETIME_LESS_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATE_GREATER_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATE_GREATER_THAN_OR_EQUAL));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATE_LESS_THAN));
!         set.add(new ComparisonFunction(ComparisonFunction.
!                                        NAME_DATE_LESS_THAN_OR_EQUAL));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = ComparisonFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new ComparisonFunction((String)(it.next())));
  
          return set;

Index: NumericConvertFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NumericConvertFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NumericConvertFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- NumericConvertFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,62 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
! 
!         set.add(new NumericConvertFunction(NumericConvertFunction.
!                                            NAME_DOUBLE_TO_INTEGER));
!         set.add(new NumericConvertFunction(NumericConvertFunction.
!                                            NAME_INTEGER_TO_DOUBLE));
  
          return set;
--- 55,63 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
!         Iterator it = NumericConvertFunction.getSupportedIdentifiers().
!             iterator();
!         
!         while (it.hasNext())
!             set.add(new NumericConvertFunction((String)(it.next())));
  
          return set;

Index: AbsFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AbsFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbsFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- AbsFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 40,43 ****
--- 40,44 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 54,60 ****
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         set.add(new AbsFunction(AbsFunction.NAME_INTEGER_ABS));
!         set.add(new AbsFunction(AbsFunction.NAME_DOUBLE_ABS));
  
          return set;
--- 55,62 ----
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = AbsFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new AbsFunction((String)(it.next())));
  
          return set;

Index: GeneralBagFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralBagFunctionCluster.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GeneralBagFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
--- GeneralBagFunctionCluster.java	18 Mar 2004 21:13:09 -0000	1.3
***************
*** 41,44 ****
--- 41,45 ----
  
  import java.util.HashSet;
+ import java.util.Iterator;
  import java.util.Set;
  
***************
*** 53,80 ****
  {
  
-     /**
-      * A complete list of all the XACML datatypes supported by the Set
-      * functions, using the "simple" form of the names (eg, string
-      * instead of http://www.w3.org/2001/XMLSchema#string)
-      */
-     private static String simpleTypes [] = {
-         "string", "boolean", "integer", "double", "date", "dateTime",
-         "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration",
-         "yearMonthDuration", "x500Name", "rfc822Name"
-     };
- 
      public Set getSupportedFunctions() {
          Set set = new HashSet();
  
!         for (int i = 0; i < simpleTypes.length; i++) {
!             String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i];
! 
!             set.add(new GeneralBagFunction(baseName + GeneralBagFunction.
!                                            NAME_BASE_ONE_AND_ONLY));
!             set.add(new GeneralBagFunction(baseName + GeneralBagFunction.
!                                            NAME_BASE_BAG_SIZE));
!             set.add(new GeneralBagFunction(baseName + GeneralBagFunction.
!                                            NAME_BASE_BAG));
!         }
  
          return set;
--- 54,63 ----
  {
  
      public Set getSupportedFunctions() {
          Set set = new HashSet();
+         Iterator it = GeneralBagFunction.getSupportedIdentifiers().iterator();
  
!         while (it.hasNext())
!             set.add(new GeneralBagFunction((String)(it.next())));
  
          return set;

[Sunxacml-commit] sunxacml build.xml,1.3,1.4

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8188

Modified Files:
	build.xml 
Log Message:
updated version string to 1.2


Index: build.xml
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	17 Mar 2004 18:03:37 -0000	1.3
--- build.xml	18 Mar 2004 21:12:23 -0000	1.4
***************
*** 1,5 ****
  
  <!--
!  Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
  
   Redistribution and use in source and binary forms, with or without
--- 1,5 ----
  
  <!--
!  Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
  
   Redistribution and use in source and binary forms, with or without
***************
*** 49,53 ****
    <!-- Values for the JavaDocs -->
    <property name="projName" value="Sun's XACML Implementation"/>
!   <property name="projVersion" value="1.1"/>
  
    <!-- Builds the project into debug-enabled class files -->
--- 49,53 ----
    <!-- Values for the JavaDocs -->
    <property name="projName" value="Sun's XACML Implementation"/>
!   <property name="projVersion" value="1.2"/>
  
    <!-- Builds the project into debug-enabled class files -->
***************
*** 82,86 ****
        </footer>
        <bottom>
!         <![CDATA[<font size="-1">Copyright 2003 Sun Microsystems,
          Inc. All rights reserved. Use is subject to license
          terms.<p>Sun, Sun Microsystems, the Sun Logo, and Java are
--- 82,86 ----
        </footer>
        <bottom>
!         <![CDATA[<font size="-1">Copyright 2003-2004 Sun Microsystems,
          Inc. All rights reserved. Use is subject to license
          terms.<p>Sun, Sun Microsystems, the Sun Logo, and Java are

[Sunxacml-commit] sunxacml/com/sun/xacml/cond/cluster AbsFunctionCluster.java,1.1,1.2 AddFunctionCluster.java,1.1,1.2 ComparisonFunctionCluster.java,1.1,1.2 ConditionBagFunctionCluster.java,1.1,1.2 ConditionSetFunctionCluster.java,1.1,1.2 DateMathFunctionCluster.java,1.1,1.2 DivideFunctionCluster.java,1.1,1.2 EqualFunctionCluster.java,1.1,1.2 FloorFunctionCluster.java,1.1,1.2 FunctionCluster.java,1.1,1.2 GeneralBagFunctionCluster.java,1.1,1.2 GeneralSetFunctionCluster.java,1.1,1.2 HigherOrderFunctionCluster.java,1.1,1.2 LogicalFunctionCluster.java,1.1,1.2 MatchFunctionCluster.java,1.1,1.2 ModFunctionCluster.java,1.1,1.2 MultiplyFunctionCluster.java,1.1,1.2 NOfFunctionCluster.java,1.1,1.2 NotFunctionCluster.java,1.1,1.2 NumericConvertFunctionCluster.java,1.1,1.2 RoundFunctionCluster.java,1.1,1.2 StringNormalizeFunctionCluster.java,1.1,1.2 SubtractFunctionCluster.java,1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/cond/cluster

Modified Files:
	AbsFunctionCluster.java AddFunctionCluster.java 
	ComparisonFunctionCluster.java 
	ConditionBagFunctionCluster.java 
	ConditionSetFunctionCluster.java DateMathFunctionCluster.java 
	DivideFunctionCluster.java EqualFunctionCluster.java 
	FloorFunctionCluster.java FunctionCluster.java 
	GeneralBagFunctionCluster.java GeneralSetFunctionCluster.java 
	HigherOrderFunctionCluster.java LogicalFunctionCluster.java 
	MatchFunctionCluster.java ModFunctionCluster.java 
	MultiplyFunctionCluster.java NOfFunctionCluster.java 
	NotFunctionCluster.java NumericConvertFunctionCluster.java 
	RoundFunctionCluster.java StringNormalizeFunctionCluster.java 
	SubtractFunctionCluster.java 
Log Message:
added @since tags to all classes


Index: MatchFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MatchFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MatchFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- MatchFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>MatchFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DivideFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DivideFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DivideFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- DivideFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>DivideFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: NOfFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NOfFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NOfFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- NOfFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>NOfFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: AddFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AddFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AddFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- AddFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>AddFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: EqualFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/EqualFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EqualFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- EqualFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>EqualFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: MultiplyFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MultiplyFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MultiplyFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- MultiplyFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>MultiplyFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: GeneralSetFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralSetFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralSetFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- GeneralSetFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
   * Clusters all the functions supported by <code>GeneralSetFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: StringNormalizeFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/StringNormalizeFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StringNormalizeFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- StringNormalizeFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
   * <code>StringNormalizeFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: RoundFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/RoundFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RoundFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- RoundFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>RoundFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: AbsFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AbsFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbsFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- AbsFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>AbsFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: ConditionSetFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionSetFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConditionSetFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- ConditionSetFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
   * Clusters all the functions supported by <code>ConditionSetFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: LogicalFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/LogicalFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LogicalFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- LogicalFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>LogicalFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: FunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/FunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- FunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 49,52 ****
--- 49,53 ----
   * can use a smaller configuration file.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: SubtractFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/SubtractFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SubtractFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- SubtractFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>SubtractFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: NotFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NotFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NotFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- NotFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>NotFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DateMathFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DateMathFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateMathFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- DateMathFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>DateMathFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: ModFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ModFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ModFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- ModFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>ModFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: HigherOrderFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/HigherOrderFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HigherOrderFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- HigherOrderFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>HigherOrderFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: FloorFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/FloorFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FloorFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- FloorFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>FloorFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: ComparisonFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ComparisonFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ComparisonFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- ComparisonFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>ComparisonFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: NumericConvertFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NumericConvertFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NumericConvertFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- NumericConvertFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
   * Clusters all the functions supported by <code>NumericConvertFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: ConditionBagFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionBagFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConditionBagFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- ConditionBagFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
   * Clusters all the functions supported by <code>ConditionBagFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: GeneralBagFunctionCluster.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralBagFunctionCluster.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralBagFunctionCluster.java	15 Mar 2004 21:24:49 -0000	1.1
--- GeneralBagFunctionCluster.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 47,50 ****
--- 47,51 ----
   * Clusters all the functions supported by <code>GeneralBagFunction</code>.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml/com/sun/xacml/finder/impl CurrentEnvModule.java,1.2,1.3 FilePolicyModule.java,1.3,1.4 SelectorModule.java,1.5,1.6

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/finder/impl

Modified Files:
	CurrentEnvModule.java FilePolicyModule.java 
	SelectorModule.java 
Log Message:
added @since tags to all classes


Index: SelectorModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl/SelectorModule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SelectorModule.java	13 Feb 2004 18:49:51 -0000	1.5
--- SelectorModule.java	17 Mar 2004 18:03:39 -0000	1.6
***************
*** 78,81 ****
--- 78,82 ----
   * 1.0 of XPath.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: FilePolicyModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl/FilePolicyModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FilePolicyModule.java	15 Mar 2004 21:36:29 -0000	1.3
--- FilePolicyModule.java	17 Mar 2004 18:03:39 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)FilePolicyModule.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FilePolicyModule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 83,86 ****
--- 83,87 ----
   * code.
   *
+  * @since 1.0
   * @author Seth Proctor
   */
***************
*** 153,157 ****
--- 154,161 ----
      /**
       * Constructor that specifies a set of initial policy files to use.
+      * No schema validation is performed.
       *
+      * @param fileNames a <code>List</code> of <code>String</code>s that
+      *                  identify policy files
       */
      public FilePolicyModule(List fileNames) {

Index: CurrentEnvModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/impl/CurrentEnvModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CurrentEnvModule.java	11 Aug 2003 20:48:45 -0000	1.2
--- CurrentEnvModule.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)CurrentEnvModule.java	1.5 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)CurrentEnvModule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 71,75 ****
   * make sure that values are constant within an evaluation, if that is the
   * desired behavior.
!  * 
   * @author Seth Proctor
   */
--- 71,76 ----
   * make sure that values are constant within an evaluation, if that is the
   * desired behavior.
!  *
!  * @since 1.0
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml/com/sun/xacml/attr/proxy AnyURIAttributeProxy.java,1.1,1.2 Base64BinaryAttributeProxy.java,1.1,1.2 BooleanAttributeProxy.java,1.1,1.2 DateAttributeProxy.java,1.1,1.2 DateTimeAttributeProxy.java,1.1,1.2 DayTimeDurationAttributeProxy.java,1.1,1.2 DoubleAttributeProxy.java,1.1,1.2 HexBinaryAttributeProxy.java,1.1,1.2 IntegerAttributeProxy.java,1.1,1.2 RFC822NameAttributeProxy.java,1.1,1.2 StringAttributeProxy.java,1.1,1.2 TimeAttributeProxy.java,1.1,1.2 X500NameAttributeProxy.java,1.1,1.2 YearMonthDurationAttributeProxy.java,1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/attr/proxy

Modified Files:
	AnyURIAttributeProxy.java Base64BinaryAttributeProxy.java 
	BooleanAttributeProxy.java DateAttributeProxy.java 
	DateTimeAttributeProxy.java DayTimeDurationAttributeProxy.java 
	DoubleAttributeProxy.java HexBinaryAttributeProxy.java 
	IntegerAttributeProxy.java RFC822NameAttributeProxy.java 
	StringAttributeProxy.java TimeAttributeProxy.java 
	X500NameAttributeProxy.java 
	YearMonthDurationAttributeProxy.java 
Log Message:
added @since tags to all classes


Index: X500NameAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/X500NameAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** X500NameAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- X500NameAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: StringAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/StringAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StringAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- StringAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: RFC822NameAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/RFC822NameAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RFC822NameAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- RFC822NameAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DoubleAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/DoubleAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DoubleAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- DoubleAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DayTimeDurationAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/DayTimeDurationAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DayTimeDurationAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- DayTimeDurationAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: TimeAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/TimeAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TimeAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- TimeAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: YearMonthDurationAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/YearMonthDurationAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** YearMonthDurationAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- YearMonthDurationAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: HexBinaryAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/HexBinaryAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HexBinaryAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- HexBinaryAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: BooleanAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/BooleanAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BooleanAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- BooleanAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: AnyURIAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/AnyURIAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AnyURIAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- AnyURIAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DateAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/DateAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- DateAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: Base64BinaryAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/Base64BinaryAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Base64BinaryAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- Base64BinaryAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DateTimeAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/DateTimeAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateTimeAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- DateTimeAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: IntegerAttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/proxy/IntegerAttributeProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IntegerAttributeProxy.java	15 Mar 2004 21:21:05 -0000	1.1
--- IntegerAttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 48,51 ****
--- 48,52 ----
   * code to use.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml/com/sun/xacml AbstractPolicy.java,1.8,1.9 ConfigurationStore.java,1.1,1.2 EvaluationCtx.java,1.5,1.6 Indenter.java,1.3,1.4 MatchResult.java,1.1.1.1,1.2 Obligation.java,1.4,1.5 PDP.java,1.2,1.3 PDPConfig.java,1.1.1.1,1.2 ParsingException.java,1.1.1.1,1.2 Policy.java,1.5,1.6 PolicyReference.java,1.4,1.5 PolicySet.java,1.4,1.5 PolicyTreeElement.java,1.2,1.3 ProcessingException.java,1.1.1.1,1.2 Rule.java,1.4,1.5 Target.java,1.5,1.6 TargetMatch.java,1.5,1.6 UnknownIdentifierException.java,1.1.1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml

Modified Files:
	AbstractPolicy.java ConfigurationStore.java EvaluationCtx.java 
	Indenter.java MatchResult.java Obligation.java PDP.java 
	PDPConfig.java ParsingException.java Policy.java 
	PolicyReference.java PolicySet.java PolicyTreeElement.java 
	ProcessingException.java Rule.java Target.java 
	TargetMatch.java UnknownIdentifierException.java 
Log Message:
added @since tags to all classes


Index: Obligation.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Obligation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Obligation.java	13 Feb 2004 17:55:32 -0000	1.4
--- Obligation.java	17 Mar 2004 18:03:37 -0000	1.5
***************
*** 62,65 ****
--- 62,66 ----
   * AttriubteAssignmentType XML types.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ProcessingException.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ProcessingException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ProcessingException.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- ProcessingException.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ProcessingException.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ProcessingException.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 43,46 ****
--- 43,47 ----
   * be resolved.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: EvaluationCtx.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/EvaluationCtx.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EvaluationCtx.java	27 Oct 2003 04:44:01 -0000	1.5
--- EvaluationCtx.java	17 Mar 2004 18:03:37 -0000	1.6
***************
*** 3,7 ****
   * @(#)EvaluationCtx.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)EvaluationCtx.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 79,86 ****
   * of an evaluation if the values are being generated by the PDP (if the
   * values are provided in the Request, then obviously they will remain
!  * constant). The default behavior is for these environment values to be cached,
!  * so that (for example) the current time remains constant over the course
!  * of an evaluation.
   *
   * @author Seth Proctor
   */
--- 79,87 ----
   * of an evaluation if the values are being generated by the PDP (if the
   * values are provided in the Request, then obviously they will remain
!  * constant). The default behavior is for these environment values to be
!  * cached, so that (for example) the current time remains constant over the
!  * course of an evaluation.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: TargetMatch.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/TargetMatch.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TargetMatch.java	13 Feb 2004 17:55:32 -0000	1.5
--- TargetMatch.java	17 Mar 2004 18:03:37 -0000	1.6
***************
*** 75,78 ****
--- 75,79 ----
   * Target match the corresponding attribute values in the request context.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: AbstractPolicy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/AbstractPolicy.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractPolicy.java	13 Feb 2004 17:55:32 -0000	1.8
--- AbstractPolicy.java	17 Mar 2004 18:03:37 -0000	1.9
***************
*** 64,67 ****
--- 64,68 ----
   * Represents an instance of an XACML policy. 
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: Indenter.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Indenter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Indenter.java	2 Sep 2003 21:39:44 -0000	1.3
--- Indenter.java	17 Mar 2004 18:03:37 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)Indenter.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Indenter.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 45,48 ****
--- 45,49 ----
   * formed according to a specified indent width and the given depth.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: PDPConfig.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDPConfig.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PDPConfig.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- PDPConfig.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)PDPConfig.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PDPConfig.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 48,51 ****
--- 48,52 ----
   * PDP should use.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: Target.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Target.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Target.java	30 Sep 2003 14:51:58 -0000	1.5
--- Target.java	17 Mar 2004 18:03:37 -0000	1.6
***************
*** 1,7 ****
  
  /*
!  * @(#)Target.java	1.11 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Target.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * policy, or rule) is applicable to a given request. 
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicySet.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PolicySet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PolicySet.java	25 Aug 2003 16:53:10 -0000	1.4
--- PolicySet.java	17 Mar 2004 18:03:37 -0000	1.5
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicySet.java	1.11 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicySet.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 63,66 ****
--- 63,67 ----
   * URIs that point to policies and policy sets.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: MatchResult.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/MatchResult.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** MatchResult.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- MatchResult.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)MatchResult.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)MatchResult.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 45,48 ****
--- 45,49 ----
   * target doesn't match the input request, or the result is Indeterminate.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicyReference.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PolicyReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PolicyReference.java	20 Oct 2003 16:57:56 -0000	1.4
--- PolicyReference.java	17 Mar 2004 18:03:37 -0000	1.5
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicyReference.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicyReference.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 73,76 ****
--- 73,77 ----
   * results of these calls, since the referenced policy may change.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ParsingException.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ParsingException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ParsingException.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- ParsingException.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ParsingException.java	1.3 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ParsingException.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 41,44 ****
--- 41,45 ----
   * Exception that gets thrown if any general parsing error occurs.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: UnknownIdentifierException.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/UnknownIdentifierException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** UnknownIdentifierException.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- UnknownIdentifierException.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)UnknownIdentifierException.java	1.3 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)UnknownIdentifierException.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 42,45 ****
--- 42,46 ----
   * identifier used in any of the standard factories.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicyTreeElement.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PolicyTreeElement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PolicyTreeElement.java	25 Aug 2003 16:53:10 -0000	1.2
--- PolicyTreeElement.java	17 Mar 2004 18:03:37 -0000	1.3
***************
*** 3,7 ****
   * @(#)PolicyTreeElement.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)PolicyTreeElement.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 52,55 ****
--- 52,56 ----
   * tree as they never contain children.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: Policy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Policy.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Policy.java	29 Aug 2003 18:58:32 -0000	1.5
--- Policy.java	17 Mar 2004 18:03:37 -0000	1.6
***************
*** 1,7 ****
  
  /*
!  * @(#)Policy.java	1.10 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Policy.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 61,64 ****
--- 61,65 ----
   * a policy.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: Rule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/Rule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Rule.java	29 Aug 2003 18:58:32 -0000	1.4
--- Rule.java	17 Mar 2004 18:03:37 -0000	1.5
***************
*** 1,7 ****
  
  /*
!  * @(#)Rule.java	1.12 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Rule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 65,68 ****
--- 65,69 ----
   * of most policies.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ConfigurationStore.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ConfigurationStore.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConfigurationStore.java	15 Mar 2004 21:53:38 -0000	1.1
--- ConfigurationStore.java	17 Mar 2004 18:03:37 -0000	1.2
***************
*** 111,114 ****
--- 111,115 ----
   * between now and the next release.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: PDP.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/PDP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PDP.java	25 Aug 2003 16:53:10 -0000	1.2
--- PDP.java	17 Mar 2004 18:03:37 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)PDP.java	1.13 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PDP.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 66,69 ****
--- 66,70 ----
   * instantiating this object.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml/com/sun/xacml/finder AttributeFinder.java,1.2,1.3 AttributeFinderModule.java,1.2,1.3 PolicyFinder.java,1.1.1.1,1.2 PolicyFinderModule.java,1.1.1.1,1.2 PolicyFinderResult.java,1.1.1.1,1.2 ResourceFinder.java,1.1.1.1,1.2 ResourceFinderModule.java,1.1.1.1,1.2 ResourceFinderResult.java,1.1.1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/finder

Modified Files:
	AttributeFinder.java AttributeFinderModule.java 
	PolicyFinder.java PolicyFinderModule.java 
	PolicyFinderResult.java ResourceFinder.java 
	ResourceFinderModule.java ResourceFinderResult.java 
Log Message:
added @since tags to all classes


Index: PolicyFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/PolicyFinder.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PolicyFinder.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- PolicyFinder.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicyFinder.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicyFinder.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 73,76 ****
--- 73,77 ----
   * modules you include, and how they can cache policy data.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: AttributeFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AttributeFinder.java	29 Aug 2003 18:58:33 -0000	1.2
--- AttributeFinder.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)AttributeFinder.java	1.6 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AttributeFinder.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 66,69 ****
--- 66,70 ----
   * in order until it finds a value or runs out of modules.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicyFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/PolicyFinderModule.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PolicyFinderModule.java	13 Feb 2003 22:19:13 -0000	1.1.1.1
--- PolicyFinderModule.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicyFinderModule.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicyFinderModule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 48,51 ****
--- 48,52 ----
   * implement the methods for the features they're supporting.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: AttributeFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/AttributeFinderModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AttributeFinderModule.java	29 Aug 2003 18:58:33 -0000	1.2
--- AttributeFinderModule.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)AttributeFinderModule.java	1.4 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AttributeFinderModule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 54,57 ****
--- 54,58 ----
   * implement the methods for the features they're supporting.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicyFinderResult.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/PolicyFinderResult.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** PolicyFinderResult.java	13 Feb 2003 22:19:13 -0000	1.1.1.1
--- PolicyFinderResult.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicyFinderResult.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicyFinderResult.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 51,54 ****
--- 51,55 ----
   * so the result from calling findPolicy can never be more than one policy.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ResourceFinder.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinder.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResourceFinder.java	13 Feb 2003 22:19:13 -0000	1.1.1.1
--- ResourceFinder.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ResourceFinder.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ResourceFinder.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 60,63 ****
--- 60,64 ----
   * the modules in this finder.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ResourceFinderResult.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinderResult.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResourceFinderResult.java	13 Feb 2003 22:19:13 -0000	1.1.1.1
--- ResourceFinderResult.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ResourceFinderResult.java	1.6 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ResourceFinderResult.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 50,53 ****
--- 50,54 ----
   * that had an error.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: ResourceFinderModule.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/finder/ResourceFinderModule.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResourceFinderModule.java	13 Feb 2003 22:19:13 -0000	1.1.1.1
--- ResourceFinderModule.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ResourceFinderModule.java	1.5 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ResourceFinderModule.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 46,49 ****
--- 46,50 ----
   * implement the methods for the features they're supporting.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml/com/sun/xacml/combine BaseCombiningAlgFactory.java,1.1,1.2 CombiningAlgFactory.java,1.7,1.8 CombiningAlgFactoryProxy.java,1.1,1.2 CombiningAlgorithm.java,1.2,1.3 DenyOverridesPolicyAlg.java,1.3,1.4 DenyOverridesRuleAlg.java,1.3,1.4 FirstApplicablePolicyAlg.java,1.2,1.3 FirstApplicableRuleAlg.java,1.2,1.3 OnlyOneApplicablePolicyAlg.java,1.2,1.3 OrderedDenyOverridesPolicyAlg.java,1.1,1.2 OrderedDenyOverridesRuleAlg.java,1.1,1.2 OrderedPermitOverridesPolicyAlg.java,1.1,1.2 OrderedPermitOverridesRuleAlg.java,1.1,1.2 PermitOverridesPolicyAlg.java,1.3,1.4 PermitOverridesRuleAlg.java,1.3,1.4 PolicyCombiningAlgorithm.java,1.2,1.3 RuleCombiningAlgorithm.java,1.3,1.4 StandardCombiningAlgFactory.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/combine

Modified Files:
	BaseCombiningAlgFactory.java CombiningAlgFactory.java 
	CombiningAlgFactoryProxy.java CombiningAlgorithm.java 
	DenyOverridesPolicyAlg.java DenyOverridesRuleAlg.java 
	FirstApplicablePolicyAlg.java FirstApplicableRuleAlg.java 
	OnlyOneApplicablePolicyAlg.java 
	OrderedDenyOverridesPolicyAlg.java 
	OrderedDenyOverridesRuleAlg.java 
	OrderedPermitOverridesPolicyAlg.java 
	OrderedPermitOverridesRuleAlg.java 
	PermitOverridesPolicyAlg.java PermitOverridesRuleAlg.java 
	PolicyCombiningAlgorithm.java RuleCombiningAlgorithm.java 
	StandardCombiningAlgFactory.java 
Log Message:
added @since tags to all classes


Index: OrderedPermitOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OrderedPermitOverridesRuleAlg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OrderedPermitOverridesRuleAlg.java	25 Aug 2003 16:44:57 -0000	1.1
--- OrderedPermitOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 3,7 ****
   * @(#)OrderedPermitOverridesRuleAlg.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)OrderedPermitOverridesRuleAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * the regular Permit Overrides implementation since it is also orderd.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: StandardCombiningAlgFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/StandardCombiningAlgFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StandardCombiningAlgFactory.java	15 Mar 2004 21:34:51 -0000	1.2
--- StandardCombiningAlgFactory.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
   * 1.0 and 1.1. It is the default factory used by the system.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: CombiningAlgorithm.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/CombiningAlgorithm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CombiningAlgorithm.java	25 Aug 2003 16:46:33 -0000	1.2
--- CombiningAlgorithm.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)CombiningAlgorithm.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)CombiningAlgorithm.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 50,53 ****
--- 50,54 ----
   * must be implemented.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: OnlyOneApplicablePolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OnlyOneApplicablePolicyAlg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OnlyOneApplicablePolicyAlg.java	25 Aug 2003 16:46:33 -0000	1.2
--- OnlyOneApplicablePolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)OnlyOneApplicablePolicyAlg.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)OnlyOneApplicablePolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * pdp only selects one policy per request.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: OrderedPermitOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OrderedPermitOverridesPolicyAlg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OrderedPermitOverridesPolicyAlg.java	25 Aug 2003 16:44:57 -0000	1.1
--- OrderedPermitOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 3,7 ****
   * @(#)OrderedPermitOverridesPolicyAlg.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)OrderedPermitOverridesPolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * the regular Permit Overrides implementation since it is also orderd.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: DenyOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/DenyOverridesPolicyAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DenyOverridesPolicyAlg.java	25 Aug 2003 16:46:33 -0000	1.3
--- DenyOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)DenyOverridesPolicyAlg.java	1.8 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DenyOverridesPolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 60,63 ****
--- 60,64 ----
   * supports the Ordered Deny Overrides algorithm.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: CombiningAlgFactoryProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/CombiningAlgFactoryProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CombiningAlgFactoryProxy.java	13 Feb 2004 17:52:14 -0000	1.1
--- CombiningAlgFactoryProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
   * <code>CombiningAlgFactory</code>s.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: OrderedDenyOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OrderedDenyOverridesRuleAlg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OrderedDenyOverridesRuleAlg.java	25 Aug 2003 16:44:57 -0000	1.1
--- OrderedDenyOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 3,7 ****
   * @(#)OrderedDenyOverridesRuleAlg.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)OrderedDenyOverridesRuleAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * the regular Deny Overrides implementation since it is also orderd.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: OrderedDenyOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/OrderedDenyOverridesPolicyAlg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OrderedDenyOverridesPolicyAlg.java	25 Aug 2003 16:44:57 -0000	1.1
--- OrderedDenyOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 3,7 ****
   * OrderedDenyOverridesPolicyAlg.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * OrderedDenyOverridesPolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * the regular Deny Overrides implementation since it is also orderd.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: FirstApplicablePolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/FirstApplicablePolicyAlg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FirstApplicablePolicyAlg.java	25 Aug 2003 16:46:33 -0000	1.2
--- FirstApplicablePolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)FirstApplicablePolicyAlg.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FirstApplicablePolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 56,59 ****
--- 56,60 ----
   * that evaluation result.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: BaseCombiningAlgFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/BaseCombiningAlgFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseCombiningAlgFactory.java	15 Mar 2004 21:34:50 -0000	1.1
--- BaseCombiningAlgFactory.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 49,52 ****
--- 49,53 ----
   * setup the factory with any algorithms.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: FirstApplicableRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/FirstApplicableRuleAlg.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FirstApplicableRuleAlg.java	25 Aug 2003 16:46:33 -0000	1.2
--- FirstApplicableRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)FirstApplicableRuleAlg.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FirstApplicableRuleAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 55,58 ****
--- 55,59 ----
   * that evaluation result.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PermitOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/PermitOverridesRuleAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PermitOverridesRuleAlg.java	25 Aug 2003 16:46:33 -0000	1.3
--- PermitOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)PermitOverridesRuleAlg.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PermitOverridesRuleAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * supports the Ordered Permit Overrides algorithm.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: DenyOverridesRuleAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/DenyOverridesRuleAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DenyOverridesRuleAlg.java	25 Aug 2003 16:46:33 -0000	1.3
--- DenyOverridesRuleAlg.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)DenyOverridesRuleAlg.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DenyOverridesRuleAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * supports the Ordered Deny Overrides algorithm.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PermitOverridesPolicyAlg.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/PermitOverridesPolicyAlg.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PermitOverridesPolicyAlg.java	25 Aug 2003 16:46:33 -0000	1.3
--- PermitOverridesPolicyAlg.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)PermitOverridesPolicyAlg.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PermitOverridesPolicyAlg.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 60,63 ****
--- 60,64 ----
   * supports the Ordered Permit Overrides algorithm.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: RuleCombiningAlgorithm.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/RuleCombiningAlgorithm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RuleCombiningAlgorithm.java	25 Aug 2003 16:46:33 -0000	1.3
--- RuleCombiningAlgorithm.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)RuleCombiningAlgorithm.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)RuleCombiningAlgorithm.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 49,52 ****
--- 49,53 ----
   * The base type for all Rule combining algorithms.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: CombiningAlgFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/CombiningAlgFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CombiningAlgFactory.java	15 Mar 2004 21:34:50 -0000	1.7
--- CombiningAlgFactory.java	17 Mar 2004 18:03:38 -0000	1.8
***************
*** 46,49 ****
--- 46,50 ----
   * algorithms.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: PolicyCombiningAlgorithm.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/combine/PolicyCombiningAlgorithm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PolicyCombiningAlgorithm.java	25 Aug 2003 16:46:33 -0000	1.2
--- PolicyCombiningAlgorithm.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)PolicyCombiningAlgorithm.java	1.8 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)PolicyCombiningAlgorithm.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * are also included in the result.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

[Sunxacml-commit] sunxacml/com/sun/xacml/ctx Attribute.java,1.7,1.8 InputParser.java,1.1.1.1,1.2 RequestCtx.java,1.6,1.7 ResponseCtx.java,1.2,1.3 Result.java,1.2,1.3 Status.java,1.2,1.3 StatusDetail.java,1.1.1.1,1.2 Subject.java,1.1,1.2

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/ctx

Modified Files:
	Attribute.java InputParser.java RequestCtx.java 
	ResponseCtx.java Result.java Status.java StatusDetail.java 
	Subject.java 
Log Message:
added @since tags to all classes


Index: Attribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/Attribute.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Attribute.java	13 Feb 2004 17:55:32 -0000	1.7
--- Attribute.java	17 Mar 2004 18:03:39 -0000	1.8
***************
*** 60,63 ****
--- 60,64 ----
   * Represents the AttributeType XML type found in the context schema.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: RequestCtx.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/RequestCtx.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RequestCtx.java	29 Aug 2003 18:52:56 -0000	1.6
--- RequestCtx.java	17 Mar 2004 18:03:39 -0000	1.7
***************
*** 1,7 ****
  
  /*
!  * @(#)RequestCtx.java	1.16 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)RequestCtx.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 72,75 ****
--- 72,76 ----
   * the data used to start a policy evaluation.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: ResponseCtx.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/ResponseCtx.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ResponseCtx.java	25 Aug 2003 16:53:10 -0000	1.2
--- ResponseCtx.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)ResponseCtx.java	1.11 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ResponseCtx.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 61,64 ****
--- 61,65 ----
   * Represents the response to a request made to the XACML PDP.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: StatusDetail.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/StatusDetail.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StatusDetail.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- StatusDetail.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)StatusDetail.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)StatusDetail.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 57,60 ****
--- 57,61 ----
   * interpret the data appropriately.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: Subject.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/Subject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Subject.java	22 Jul 2003 15:05:45 -0000	1.1
--- Subject.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 3,7 ****
   * @(#)Subject.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)Subject.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 54,57 ****
--- 54,58 ----
   * with a particular subject.
   *
+  * @since 1.1
   * @author seth proctor
   */

Index: Result.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/Result.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Result.java	25 Aug 2003 16:53:10 -0000	1.2
--- Result.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)Result.java	1.9 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Result.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 59,62 ****
--- 59,63 ----
   * status data. Any number of obligations may also be included.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: InputParser.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/InputParser.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** InputParser.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- InputParser.java	17 Mar 2004 18:03:39 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)InputParser.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)InputParser.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 58,61 ****
--- 58,62 ----
   * parsing input based on the context schema.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: Status.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/ctx/Status.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Status.java	25 Aug 2003 16:53:10 -0000	1.2
--- Status.java	17 Mar 2004 18:03:39 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)Status.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Status.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 58,61 ****
--- 58,62 ----
   * the status is OK.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

[Sunxacml-commit] sunxacml build.xml,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173

Modified Files:
	build.xml 
Log Message:
added @since tags to all classes


Index: build.xml
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	30 Sep 2003 19:58:39 -0000	1.2
--- build.xml	17 Mar 2004 18:03:37 -0000	1.3
***************
*** 71,75 ****
               classpath="${classDir}" packagenames="com.sun.*"
               overview="${srcDir}/overview.html"
!              windowtitle="${projName}" doctitle="${projName}"
               link="http://java.sun.com/j2se/1.4/docs/api">
        <header>
--- 71,75 ----
               classpath="${classDir}" packagenames="com.sun.*"
               overview="${srcDir}/overview.html"
!              windowtitle="${projName}" doctitle="${projName}" author="no"
               link="http://java.sun.com/j2se/1.4/docs/api">
        <header>

[Sunxacml-commit] sunxacml/com/sun/xacml/attr AnyURIAttribute.java,1.1.1.1,1.2 AttributeDesignator.java,1.4,1.5 AttributeFactory.java,1.5,1.6 AttributeFactoryProxy.java,1.1,1.2 AttributeProxy.java,1.1.1.1,1.2 AttributeSelector.java,1.5,1.6 AttributeValue.java,1.4,1.5 BagAttribute.java,1.2,1.3 Base64.java,1.1.1.1,1.2 Base64BinaryAttribute.java,1.1.1.1,1.2 BaseAttributeFactory.java,1.1,1.2 BooleanAttribute.java,1.1.1.1,1.2 DateAttribute.java,1.1.1.1,1.2 DateTimeAttribute.java,1.2,1.3 DayTimeDurationAttribute.java,1.2,1.3 DoubleAttribute.java,1.1.1.1,1.2 HexBinaryAttribute.java,1.1.1.1,1.2 IntegerAttribute.java,1.1.1.1,1.2 RFC822NameAttribute.java,1.1.1.1,1.2 StandardAttributeFactory.java,1.2,1.3 StringAttribute.java,1.3,1.4 TimeAttribute.java,1.4,1.5 X500NameAttribute.java,1.1.1.1,1.2 YearMonthDurationAttribute.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/attr

Modified Files:
	AnyURIAttribute.java AttributeDesignator.java 
	AttributeFactory.java AttributeFactoryProxy.java 
	AttributeProxy.java AttributeSelector.java AttributeValue.java 
	BagAttribute.java Base64.java Base64BinaryAttribute.java 
	BaseAttributeFactory.java BooleanAttribute.java 
	DateAttribute.java DateTimeAttribute.java 
	DayTimeDurationAttribute.java DoubleAttribute.java 
	HexBinaryAttribute.java IntegerAttribute.java 
	RFC822NameAttribute.java StandardAttributeFactory.java 
	StringAttribute.java TimeAttribute.java X500NameAttribute.java 
	YearMonthDurationAttribute.java 
Log Message:
added @since tags to all classes


Index: AttributeSelector.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeSelector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AttributeSelector.java	29 Aug 2003 18:58:33 -0000	1.5
--- AttributeSelector.java	17 Mar 2004 18:03:38 -0000	1.6
***************
*** 1,7 ****
  
  /*
!  * @(#)AttributeSelector.java	1.11 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AttributeSelector.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 67,70 ****
--- 67,71 ----
   * different XPath implementations.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: StringAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/StringAttribute.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringAttribute.java	7 Nov 2003 17:35:32 -0000	1.3
--- StringAttribute.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)StringAttribute.java	1.9 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)StringAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 55,58 ****
--- 55,59 ----
   * elements are not valid.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: Base64.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/Base64.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Base64.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- Base64.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)Base64.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Base64.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 54,58 ****
   * <p>
   * All methods of this class are static and thread-safe.
!  * 
   * @author Anne Anderson
   */
--- 54,59 ----
   * <p>
   * All methods of this class are static and thread-safe.
!  *
!  * @since 1.0
   * @author Anne Anderson
   */

Index: IntegerAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/IntegerAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** IntegerAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- IntegerAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)IntegerAttribute.java	1.11 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)IntegerAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * all methods of the class are thread-safe.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Steve Hanna

Index: AnyURIAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AnyURIAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AnyURIAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- AnyURIAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)AnyURIAttribute.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AnyURIAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * xs:anyURI values.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: DoubleAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/DoubleAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DoubleAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- DoubleAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)DoubleAttribute.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DoubleAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 46,50 ****
   * xsi:double values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  * 
   * @author Marco Barreno
   * @author Seth Proctor
--- 46,51 ----
   * xsi:double values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  *
!  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: AttributeValue.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeValue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AttributeValue.java	29 Aug 2003 18:55:28 -0000	1.4
--- AttributeValue.java	17 Mar 2004 18:03:38 -0000	1.5
***************
*** 1,7 ****
  
  /*
!  * @(#)AttributeValue.java	1.14 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AttributeValue.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 58,61 ****
--- 58,62 ----
   * <code>Object</code>, which are used for equality checking.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: YearMonthDurationAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/YearMonthDurationAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** YearMonthDurationAttribute.java	14 Aug 2003 21:35:45 -0000	1.2
--- YearMonthDurationAttribute.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)YearMonthDurationAttribute.java	1.9 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)YearMonthDurationAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 56,59 ****
--- 56,60 ----
   * these objects are cloned before being returned.
   * 
+  * @since 1.0
   * @author Steve Hanna
   */

Index: AttributeFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AttributeFactory.java	15 Mar 2004 21:34:50 -0000	1.5
--- AttributeFactory.java	17 Mar 2004 18:03:38 -0000	1.6
***************
*** 51,54 ****
--- 51,55 ----
   * there is always one default factory used by the core code.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Marco Barreno

Index: AttributeProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeProxy.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AttributeProxy.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- AttributeProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)AttributeProxy.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)AttributeProxy.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 46,49 ****
--- 46,50 ----
   * the <code>AttributeFactory</code>.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: RFC822NameAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/RFC822NameAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** RFC822NameAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- RFC822NameAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)RFC822NameAttribute.java	1.4 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)RFC822NameAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 45,48 ****
--- 45,49 ----
   * Representation of an rfc822Name (ie, an email address).
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: TimeAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/TimeAttribute.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TimeAttribute.java	26 Aug 2003 14:39:33 -0000	1.4
--- TimeAttribute.java	17 Mar 2004 18:03:38 -0000	1.5
***************
*** 1,7 ****
  
  /*
!  * @(#)TimeAttribute.java	1.9 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)TimeAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 58,62 ****
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  * 
   * @author Steve Hanna
   * @author Seth Proctor
--- 58,63 ----
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  *
!  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: DateAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/DateAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DateAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- DateAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)DateAttribute.java	1.10 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DateAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 60,64 ****
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  * 
   * @author Marco Barreno
   * @author Seth Proctor
--- 60,65 ----
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  *
!  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: Base64BinaryAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/Base64BinaryAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Base64BinaryAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- Base64BinaryAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)Base64BinaryAttribute.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Base64BinaryAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 52,56 ****
   * xsi:base64Binary values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  * 
   * @author Steve Hanna
   */
--- 52,57 ----
   * xsi:base64Binary values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  *
!  * @since 1.0
   * @author Steve Hanna
   */

Index: AttributeFactoryProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeFactoryProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AttributeFactoryProxy.java	13 Feb 2004 17:52:10 -0000	1.1
--- AttributeFactoryProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
   * <code>AttributeFactory</code>s.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: BaseAttributeFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/BaseAttributeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseAttributeFactory.java	15 Mar 2004 21:34:50 -0000	1.1
--- BaseAttributeFactory.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 52,55 ****
--- 52,56 ----
   * setup the factory with any datatypes.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DayTimeDurationAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/DayTimeDurationAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DayTimeDurationAttribute.java	14 Aug 2003 21:35:45 -0000	1.2
--- DayTimeDurationAttribute.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)DayTimeDurationAttribute.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DayTimeDurationAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 55,59 ****
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  * 
   * @author Steve Hanna
   */
--- 55,60 ----
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  *
!  * @since 1.0
   * @author Steve Hanna
   */

Index: BooleanAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/BooleanAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** BooleanAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- BooleanAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)BooleanAttribute.java	1.10 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)BooleanAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 49,52 ****
--- 49,53 ----
   * all methods of the class are thread-safe.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Steve Hanna

Index: AttributeDesignator.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/AttributeDesignator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AttributeDesignator.java	27 Oct 2003 04:49:22 -0000	1.4
--- AttributeDesignator.java	17 Mar 2004 18:03:38 -0000	1.5
***************
*** 3,7 ****
   * @(#)AttributeDesignator.java
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 3,7 ----
   * @(#)AttributeDesignator.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 67,70 ****
--- 67,71 ----
   * Represents all four kinds of Designators in XACML.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: BagAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/BagAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BagAttribute.java	7 Jan 2004 21:31:18 -0000	1.2
--- BagAttribute.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)BagAttribute.java	1.14 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)BagAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 56,59 ****
--- 56,60 ----
   * to add some functionality to let this go into the factory.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Steve Hanna

Index: StandardAttributeFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/StandardAttributeFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StandardAttributeFactory.java	15 Mar 2004 21:34:50 -0000	1.2
--- StandardAttributeFactory.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 59,62 ****
--- 59,63 ----
   * 1.0 and 1.1. It is the default factory used by the system.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: DateTimeAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/DateTimeAttribute.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DateTimeAttribute.java	30 Sep 2003 19:59:55 -0000	1.2
--- DateTimeAttribute.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)DateTimeAttribute.java	1.9 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)DateTimeAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 62,66 ****
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  * 
   * @author Marco Barreno
   * @author Seth Proctor
--- 62,67 ----
   * thread-safe. The <code>Date</code> objects returned are not, but
   * these objects are cloned before being returned.
!  *
!  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: X500NameAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/X500NameAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** X500NameAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- X500NameAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)X500NameAttribute.java	1.8 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)X500NameAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 47,50 ****
--- 47,51 ----
   * Representation of an X500 Name.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: HexBinaryAttribute.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/attr/HexBinaryAttribute.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** HexBinaryAttribute.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- HexBinaryAttribute.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)HexBinaryAttribute.java	1.6 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)HexBinaryAttribute.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 50,54 ****
   * xsi:hexBinary values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  * 
   * @author Steve Hanna
   */
--- 50,55 ----
   * xsi:hexBinary values. All objects of this class are immutable and
   * all methods of the class are thread-safe.
!  *
!  * @since 1.0
   * @author Steve Hanna
   */

[Sunxacml-commit] sunxacml/com/sun/xacml/cond AbsFunction.java,1.2,1.3 AddFunction.java,1.2,1.3 Apply.java,1.6,1.7 BagFunction.java,1.2,1.3 BaseFunctionFactory.java,1.1,1.2 BasicFunctionFactoryProxy.java,1.1,1.2 ComparisonFunction.java,1.3,1.4 ConditionBagFunction.java,1.1,1.2 ConditionSetFunction.java,1.1,1.2 DateMathFunction.java,1.2,1.3 DivideFunction.java,1.2,1.3 EqualFunction.java,1.3,1.4 Evaluatable.java,1.2,1.3 EvaluationResult.java,1.1.1.1,1.2 FloorFunction.java,1.2,1.3 Function.java,1.3,1.4 FunctionBase.java,1.2,1.3 FunctionFactory.java,1.5,1.6 FunctionFactoryProxy.java,1.1,1.2 FunctionProxy.java,1.2,1.3 FunctionTypeException.java,1.1.1.1,1.2 GeneralBagFunction.java,1.1,1.2 GeneralSetFunction.java,1.1,1.2 HigherOrderFunction.java,1.3,1.4 LogicalFunction.java,1.2,1.3 MapFunction.java,1.2,1.3 MapFunctionProxy.java,1.1,1.2 MatchFunction.java,1.3,1.4 ModFunction.java,1.2,1.3 MultiplyFunction.java,1.2,1.3 NOfFunction.java,1.2,1.3 NotFunction.java,1.2,1.3 NumericConvertFunction.java,1.2,1.3 RoundFunction.java,1.2,1.3 SetFunction.java,1.2,1.3 StandardFunctionFactory.java,1.2,1.3 StringNormalizeFunction.java,1.2,1.3 SubtractFunction.java,1.2,1.3

[Seth P. <se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2173/com/sun/xacml/cond

Modified Files:
	AbsFunction.java AddFunction.java Apply.java BagFunction.java 
	BaseFunctionFactory.java BasicFunctionFactoryProxy.java 
	ComparisonFunction.java ConditionBagFunction.java 
	ConditionSetFunction.java DateMathFunction.java 
	DivideFunction.java EqualFunction.java Evaluatable.java 
	EvaluationResult.java FloorFunction.java Function.java 
	FunctionBase.java FunctionFactory.java 
	FunctionFactoryProxy.java FunctionProxy.java 
	FunctionTypeException.java GeneralBagFunction.java 
	GeneralSetFunction.java HigherOrderFunction.java 
	LogicalFunction.java MapFunction.java MapFunctionProxy.java 
	MatchFunction.java ModFunction.java MultiplyFunction.java 
	NOfFunction.java NotFunction.java NumericConvertFunction.java 
	RoundFunction.java SetFunction.java 
	StandardFunctionFactory.java StringNormalizeFunction.java 
	SubtractFunction.java 
Log Message:
added @since tags to all classes


Index: LogicalFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/LogicalFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LogicalFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- LogicalFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 56,59 ****
--- 56,60 ----
   * evaluates to indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: ConditionSetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ConditionSetFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConditionSetFunction.java	15 Mar 2004 21:52:41 -0000	1.1
--- ConditionSetFunction.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 55,58 ****
--- 55,59 ----
   * type-set-equals.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: NumericConvertFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NumericConvertFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NumericConvertFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- NumericConvertFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 55,58 ****
--- 55,59 ----
   * indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: GeneralSetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/GeneralSetFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralSetFunction.java	15 Mar 2004 21:52:41 -0000	1.1
--- GeneralSetFunction.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 53,56 ****
--- 53,57 ----
   * general-purpose set functions: type-intersection and type-union.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: FunctionBase.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FunctionBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunctionBase.java	29 Jul 2003 22:01:47 -0000	1.2
--- FunctionBase.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)FunctionBase.java	1.9 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FunctionBase.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 63,66 ****
--- 63,67 ----
   * on your needs.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: RoundFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/RoundFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RoundFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- RoundFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 53,56 ****
--- 53,57 ----
   * If the operand is indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: DateMathFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/DateMathFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DateMathFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- DateMathFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 65,68 ****
--- 65,69 ----
   * to indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: BagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/BagFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BagFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- BagFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 58,61 ****
--- 58,62 ----
   * functions.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: BasicFunctionFactoryProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/BasicFunctionFactoryProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BasicFunctionFactoryProxy.java	15 Mar 2004 21:52:41 -0000	1.1
--- BasicFunctionFactoryProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 41,44 ****
--- 41,45 ----
   * A simple utility class that manages triples of function factories.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: MultiplyFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MultiplyFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MultiplyFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- MultiplyFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: NotFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NotFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NotFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- NotFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 53,56 ****
--- 53,57 ----
   * indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: FunctionTypeException.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FunctionTypeException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionTypeException.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- FunctionTypeException.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)FunctionTypeException.java	1.2 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FunctionTypeException.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 43,46 ****
--- 43,47 ----
   * been called instead.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: BaseFunctionFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/BaseFunctionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BaseFunctionFactory.java	15 Mar 2004 21:34:51 -0000	1.1
--- BaseFunctionFactory.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 56,59 ****
--- 56,60 ----
   * factory implementation.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: Apply.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/Apply.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Apply.java	13 Feb 2004 17:55:32 -0000	1.6
--- Apply.java	17 Mar 2004 18:03:38 -0000	1.7
***************
*** 63,67 ****
  /**
   * Represents the XACML ApplyType and ConditionType XML types.
!  * 
   * @author Seth Proctor
   */
--- 63,68 ----
  /**
   * Represents the XACML ApplyType and ConditionType XML types.
!  *
!  * @since 1.0
   * @author Seth Proctor
   */

Index: ComparisonFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ComparisonFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ComparisonFunction.java	15 Mar 2004 21:52:41 -0000	1.3
--- ComparisonFunction.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 58,61 ****
--- 58,62 ----
   * A class that implements all of the standard comparison functions.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: Evaluatable.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/Evaluatable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Evaluatable.java	25 Aug 2003 16:53:10 -0000	1.2
--- Evaluatable.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)Evaluatable.java	1.5 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Evaluatable.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 53,56 ****
--- 53,57 ----
   * on the returned values or errors.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: Function.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/Function.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Function.java	25 Aug 2003 16:53:10 -0000	1.3
--- Function.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 1,7 ****
  
  /*
!  * @(#)Function.java	1.12 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Function.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 49,52 ****
--- 49,53 ----
   * Interface that all functions in the system must implement.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: EqualFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/EqualFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EqualFunction.java	15 Mar 2004 21:52:41 -0000	1.3
--- EqualFunction.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 67,70 ****
--- 67,71 ----
   * operands is indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: ModFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ModFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ModFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- ModFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 52,55 ****
--- 52,56 ----
   * operands is indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: FloorFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FloorFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FloorFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- FloorFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * is indeterminate, an indeterminate result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: ConditionBagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ConditionBagFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConditionBagFunction.java	15 Mar 2004 21:52:41 -0000	1.1
--- ConditionBagFunction.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 53,56 ****
--- 53,57 ----
   * condition bag function: type-is-in.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: NOfFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/NOfFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NOfFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- NOfFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 63,66 ****
--- 63,67 ----
   * returned.
   *
+  * @since 1.0
   * @author Steve Hanne
   * @author Seth Proctor

Index: SetFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/SetFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SetFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- SetFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 62,65 ****
--- 62,66 ----
   * functions.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: SubtractFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/SubtractFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SubtractFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- SubtractFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: DivideFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/DivideFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DivideFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- DivideFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: HigherOrderFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/HigherOrderFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HigherOrderFunction.java	15 Mar 2004 21:52:41 -0000	1.3
--- HigherOrderFunction.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 62,65 ****
--- 62,66 ----
   * datatypes you define.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: FunctionFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FunctionFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FunctionFactory.java	15 Mar 2004 21:34:51 -0000	1.5
--- FunctionFactory.java	17 Mar 2004 18:03:38 -0000	1.6
***************
*** 56,59 ****
--- 56,60 ----
   * creating multiple instances that all do the same thing.
   *
+  * @since 1.0
   * @author Marco Barreno
   * @author Seth Proctor

Index: MapFunctionProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MapFunctionProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MapFunctionProxy.java	15 Mar 2004 21:52:41 -0000	1.1
--- MapFunctionProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 44,47 ****
--- 44,48 ----
   * This is useful if you're configuring the PDP at runtime.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: AddFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/AddFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AddFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- AddFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: EvaluationResult.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/EvaluationResult.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EvaluationResult.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- EvaluationResult.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)EvaluationResult.java	1.6 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)EvaluationResult.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 52,55 ****
--- 52,56 ----
   * later to represent errors in pdp operation.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: MatchFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MatchFunction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MatchFunction.java	15 Mar 2004 21:52:41 -0000	1.3
--- MatchFunction.java	17 Mar 2004 18:03:38 -0000	1.4
***************
*** 57,60 ****
--- 57,61 ----
   * Implements the three standard matching functions.
   *
+  * @since 1.0
   * @author Seth Proctor
   * @author Yassir Elley

Index: GeneralBagFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/GeneralBagFunction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GeneralBagFunction.java	15 Mar 2004 21:52:41 -0000	1.1
--- GeneralBagFunction.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 55,58 ****
--- 55,59 ----
   * type-bag.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: FunctionProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FunctionProxy.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FunctionProxy.java	29 Aug 2003 18:58:33 -0000	1.2
--- FunctionProxy.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 1,7 ****
  
  /*
!  * @(#)FunctionProxy.java	1.3 01/31/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)FunctionProxy.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 45,48 ****
--- 45,49 ----
   * abstract functions, so they must be created using this interface.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: AbsFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/AbsFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AbsFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- AbsFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: StandardFunctionFactory.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/StandardFunctionFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StandardFunctionFactory.java	15 Mar 2004 21:34:51 -0000	1.2
--- StandardFunctionFactory.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 72,75 ****
--- 72,76 ----
   * contents of one instance will affect all other instances.
   *
+  * @since 1.2
   * @author Seth Proctor
   */

Index: StringNormalizeFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/StringNormalizeFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StringNormalizeFunction.java	15 Mar 2004 21:52:41 -0000	1.2
--- StringNormalizeFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 54,57 ****
--- 54,58 ----
   * result is returned.
   *
+  * @since 1.0
   * @author Steve Hanna
   * @author Seth Proctor

Index: MapFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/MapFunction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MapFunction.java	29 Jul 2003 22:01:47 -0000	1.2
--- MapFunction.java	17 Mar 2004 18:03:38 -0000	1.3
***************
*** 59,62 ****
--- 59,63 ----
   * Represents the higher order bag function map.
   *
+  * @since 1.0
   * @author Seth Proctor
   */

Index: FunctionFactoryProxy.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/FunctionFactoryProxy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FunctionFactoryProxy.java	13 Feb 2004 17:52:15 -0000	1.1
--- FunctionFactoryProxy.java	17 Mar 2004 18:03:38 -0000	1.2
***************
*** 44,47 ****
--- 44,48 ----
   * should always implement all three types and provide them together.
   *
+  * @since 1.2
   * @author Seth Proctor
   */