mholz       2004/01/30 05:37:38

  Modified:    src/share/org/apache/slide/authenticate Tag:
                        SLIDE_2_0_RELEASE_BRANCH CredentialsToken.java
               src/share/org/apache/slide/common Tag:
                        SLIDE_2_0_RELEASE_BRANCH Domain.java
                        DomainAccessToken.java Namespace.java
                        NamespaceConfig.java
                        ObjectValidationFailedException.java Service.java
                        ServiceAccessException.java SlideToken.java
                        SlideTokenImpl.java SlideTokenWrapper.java
                        UriTokenizer.java
               src/share/org/apache/slide/content Tag:
                        SLIDE_2_0_RELEASE_BRANCH Content.java
                        ContentImpl.java NodeProperty.java
                        NodeRevisionContent.java
                        NodeRevisionDescriptor.java
                        RevisionAlreadyExistException.java
                        RevisionNotFoundException.java
               src/share/org/apache/slide/macro Tag:
                        SLIDE_2_0_RELEASE_BRANCH CopyRouteRedirector.java
                        DeleteTargetRedirector.java
               src/share/org/apache/slide/search Tag:
                        SLIDE_2_0_RELEASE_BRANCH SearchImpl.java
               src/share/org/apache/slide/security Tag:
                        SLIDE_2_0_RELEASE_BRANCH SecurityImpl.java
               src/share/org/apache/slide/util Tag:
                        SLIDE_2_0_RELEASE_BRANCH HashMapObjectCache.java
                        Messages.java
               src/share/org/apache/slide/util/conf Tag:
                        SLIDE_2_0_RELEASE_BRANCH Configuration.java
               src/share/org/apache/slide/util/logger Tag:
                        SLIDE_2_0_RELEASE_BRANCH Logger.java
  Log:
  Bugfixes to javadoc.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.9.2.1   +4 -4      
jakarta-slide/src/share/org/apache/slide/authenticate/CredentialsToken.java
  
  Index: CredentialsToken.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/authenticate/CredentialsToken.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- CredentialsToken.java     12 Dec 2003 02:58:19 -0000      1.9
  +++ CredentialsToken.java     30 Jan 2004 13:37:36 -0000      1.9.2.1
  @@ -90,7 +90,7 @@
       /**
        * Constructor.
        *
  -     * @param credentials Credentials stored in this token
  +     * @param principal Principal stored in this token
        */
       public CredentialsToken(Principal principal) {
           this.credentials = principal.getName();
  
  
  
  No                   revision
  No                   revision
  1.42.2.1  +5 -5      jakarta-slide/src/share/org/apache/slide/common/Domain.java
  
  Index: Domain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Domain.java,v
  retrieving revision 1.42
  retrieving revision 1.42.2.1
  diff -u -r1.42 -r1.42.2.1
  --- Domain.java       12 Dec 2003 02:48:30 -0000      1.42
  +++ Domain.java       30 Jan 2004 13:37:36 -0000      1.42.2.1
  @@ -373,7 +373,7 @@
       /**
        * Domain initialization routine using Avalon configuration parser.
        *
  -     * @param configurationInputStream The file name to read the configuration
  +     * @param configurationFileName The file name to read the configuration
        */
       public static void init(String configurationFileName) throws Exception {
           if (isInitialized())
  
  
  
  1.8.2.1   +8 -8      
jakarta-slide/src/share/org/apache/slide/common/DomainAccessToken.java
  
  Index: DomainAccessToken.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/DomainAccessToken.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- DomainAccessToken.java    12 Dec 2003 02:48:30 -0000      1.8
  +++ DomainAccessToken.java    30 Jan 2004 13:37:36 -0000      1.8.2.1
  @@ -117,8 +117,8 @@
        * @return NamespaceToken null if no namespace of this name exists in the 
        * access token
        */
  -    public NamespaceAccessToken getNamespaceToken(String namespaceToken) {
  -        return (NamespaceAccessToken) namespaceTokens.get(namespaceToken);
  +    public NamespaceAccessToken getNamespaceToken(String namespaceName) {
  +        return (NamespaceAccessToken) namespaceTokens.get(namespaceName);
       }
       
       
  @@ -150,8 +150,8 @@
        * 
        * @param namespaceToken 
        */
  -    void addNamespaceToken(NamespaceAccessToken token) {
  -        namespaceTokens.put(token.getName(), token);
  +    void addNamespaceToken(NamespaceAccessToken namespaceToken) {
  +        namespaceTokens.put(namespaceToken.getName(), namespaceToken);
       }
       
   }
  
  
  
  1.56.2.1  +5 -5      jakarta-slide/src/share/org/apache/slide/common/Namespace.java
  
  Index: Namespace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Namespace.java,v
  retrieving revision 1.56
  retrieving revision 1.56.2.1
  diff -u -r1.56 -r1.56.2.1
  --- Namespace.java    12 Dec 2003 03:04:23 -0000      1.56
  +++ Namespace.java    30 Jan 2004 13:37:36 -0000      1.56.2.1
  @@ -862,7 +862,7 @@
        * Parses the contents of the specified reader, and uses that info to
        * initialize the specified Slide namespace.
        *
  -     * @param namespaceBaseDataDefinition Namespace base data
  +     * @param namespaceConfigurationDefinition The configuration to load.
        * @exception SlideException Something went wrong during registry or
        * services initialization
        */
  
  
  
  1.34.2.1  +5 -5      
jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java
  
  Index: NamespaceConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/NamespaceConfig.java,v
  retrieving revision 1.34
  retrieving revision 1.34.2.1
  diff -u -r1.34 -r1.34.2.1
  --- NamespaceConfig.java      17 Jan 2004 21:48:00 -0000      1.34
  +++ NamespaceConfig.java      30 Jan 2004 13:37:36 -0000      1.34.2.1
  @@ -1084,8 +1084,8 @@
       /**
        * Retrieve an action node.
        *
  +     * @param namespace The namespace, that contains the action node
        * @param actionPath Path of the action
  -     * @param ActionNode Action object
        */
       protected ActionNode getActionNode(Namespace namespace, String actionPath)
           throws InvalidNamespaceConfigurationException, SlideException {
  
  
  
  1.3.2.1   +6 -5      
jakarta-slide/src/share/org/apache/slide/common/ObjectValidationFailedException.java
  
  Index: ObjectValidationFailedException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/ObjectValidationFailedException.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- ObjectValidationFailedException.java      25 Apr 2002 21:30:12 -0000      1.3
  +++ ObjectValidationFailedException.java      30 Jan 2004 13:37:36 -0000      1.3.2.1
  @@ -81,6 +81,7 @@
        * Constructor.
        * 
        * @param uri Uri
  +     * @param cause The reason, the validation failed 
        */
       public ObjectValidationFailedException(String uri, String cause) {
           super(Messages.format(ObjectValidationFailedException.class.getName(),
  @@ -91,7 +92,7 @@
       /**
        * Constructor.
        * 
  -     * @param uri Uri
  +     * @param cause The reason, the validation failed 
        */
       public ObjectValidationFailedException(String cause) {
           super(Messages.format(ObjectValidationFailedException.class.getName(),
  
  
  
  1.12.2.1  +6 -6      jakarta-slide/src/share/org/apache/slide/common/Service.java
  
  Index: Service.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/Service.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- Service.java      12 Dec 2003 02:48:30 -0000      1.12
  +++ Service.java      30 Jan 2004 13:37:36 -0000      1.12.2.1
  @@ -123,7 +123,7 @@
        * Connects to the underlying data source (if any is needed).
        *
        * @exception ServiceConnectionFailedException Connection failed
  -     * @param token the Credeantials token containing e.g. the credential
  +     * @param crdtoken the Credentials token containing e.g. the credential
        */
       void connect(CredentialsToken crdtoken)
           throws ServiceConnectionFailedException;
  @@ -182,7 +182,7 @@
       /**
        * Connects to the service, if we were not previously connected.
        *
  -     * @param token the Credeantials token containing e.g. the credential
  +     * @param crdtoken the Credentials token containing e.g. the credential
        * @return boolean true if we were not already connected
        * @exception ServiceAccessException Unspecified service access error
        * @exception ServiceConnectionFailedException Connection failed
  
  
  
  1.10.2.1  +4 -7      
jakarta-slide/src/share/org/apache/slide/common/ServiceAccessException.java
  
  Index: ServiceAccessException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/ServiceAccessException.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- ServiceAccessException.java       21 Nov 2003 11:41:50 -0000      1.10
  +++ ServiceAccessException.java       30 Jan 2004 13:37:36 -0000      1.10.2.1
  @@ -154,9 +154,6 @@
   
       /**
        * return the cause exception, if supplied, else null.
  -     *
  -     * @param service Service from which the exception was thrown
  -     * @param e Exception which is the initial cause of the problem
        */
       public Throwable getCauseException() {
           return nestedException;
  
  
  
  1.15.2.1  +6 -6      jakarta-slide/src/share/org/apache/slide/common/SlideToken.java
  
  Index: SlideToken.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideToken.java,v
  retrieving revision 1.15
  retrieving revision 1.15.2.1
  diff -u -r1.15 -r1.15.2.1
  --- SlideToken.java   15 Jan 2004 11:54:42 -0000      1.15
  +++ SlideToken.java   30 Jan 2004 13:37:36 -0000      1.15.2.1
  @@ -173,7 +173,7 @@
       /**
        * Add a new lock token to the lock token list.
        *
  -     * @param lockToken Lock token to add
  +     * @param lockId Lock token to add
        */
       public void addLockToken(String lockId) ;
       
  @@ -181,7 +181,7 @@
       /**
        * Removes a lock token from the lock token list.
        *
  -     * @param lockToken Lock token to remove
  +     * @param lockId Lock token to remove
        */
       public void removeLockToken(String lockId) ;
       
  
  
  
  1.9.2.1   +7 -9      
jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java
  
  Index: SlideTokenImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideTokenImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- SlideTokenImpl.java       15 Jan 2004 11:54:42 -0000      1.9
  +++ SlideTokenImpl.java       30 Jan 2004 13:37:36 -0000      1.9.2.1
  @@ -87,7 +87,7 @@
       /**
        * Constructor.
        *
  -     * @param credentials Credentials stored in this token
  +     * @param credentialsToken Credentials stored in this token
        */
       public SlideTokenImpl(CredentialsToken credentialsToken) {
           this.credentialsToken = credentialsToken;
  @@ -96,8 +96,6 @@
       
       /**
        * Constructor.
  -     *
  -     * @param credentials Credentials stored in this token
        */
       public SlideTokenImpl() {
       }
  @@ -106,7 +104,7 @@
       /**
        * Constructor.
        *
  -     * @param credentials Credentials stored in this token
  +     * @param credentialsToken Credentials stored in this token
        * @param parameters Token parameters
        */
       public SlideTokenImpl(CredentialsToken credentialsToken,
  @@ -253,7 +251,7 @@
       /**
        * Add a new lock token to the lock token list.
        *
  -     * @param lockToken Lock token to add
  +     * @param lockId Lock token to add
        */
       public void addLockToken(String lockId) {
           lockTokens.put(lockId, lockId);
  @@ -263,7 +261,7 @@
       /**
        * Removes a lock token from the lock token list.
        *
  -     * @param lockToken Lock token to remove
  +     * @param lockId Lock token to remove
        */
       public void removeLockToken(String lockId) {
           lockTokens.remove(lockId);
  
  
  
  1.9.2.1   +11 -8     
jakarta-slide/src/share/org/apache/slide/common/SlideTokenWrapper.java
  
  Index: SlideTokenWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/SlideTokenWrapper.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- SlideTokenWrapper.java    15 Jan 2004 11:54:42 -0000      1.9
  +++ SlideTokenWrapper.java    30 Jan 2004 13:37:36 -0000      1.9.2.1
  @@ -72,7 +72,10 @@
   import org.apache.slide.structure.SubjectNode;
   
   /**
  - * Slide token class.
  + * The SlideTokenWrapper wraps around an existing token.
  + * It delegated all work to that token, except that it
  + * may have a different policy for store enlistment, 
  + * security and locking.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
    */
  @@ -84,8 +87,8 @@
       
       /**
        * Constructor.
  -     *
  -     * @param credentials Credentials stored in this token
  +     * @param token The token to wrap.
  +     * @param forceStoreEnlistment Is store enlistement required?
        */
       public SlideTokenWrapper(SlideToken token, boolean forceStoreEnlistment) {
           this.wrappedToken = token;
  @@ -199,7 +202,7 @@
       /**
        * Add a new lock token to the lock token list.
        *
  -     * @param lockToken Lock token to add
  +     * @param lockId Lock token to add
        */
       public void addLockToken(String lockId) {
           wrappedToken.addLockToken(lockId);
  @@ -209,7 +212,7 @@
       /**
        * Removes a lock token from the lock token list.
        *
  -     * @param lockToken Lock token to remove
  +     * @param lockId Lock token to remove
        */
       public void removeLockToken(String lockId) {
           wrappedToken.removeLockToken(lockId);
  
  
  
  1.5.2.1   +5 -5      
jakarta-slide/src/share/org/apache/slide/common/UriTokenizer.java
  
  Index: UriTokenizer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/common/UriTokenizer.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- UriTokenizer.java 6 Jan 2004 15:45:13 -0000       1.5
  +++ UriTokenizer.java 30 Jan 2004 13:37:36 -0000      1.5.2.1
  @@ -122,7 +122,7 @@
        * Constructor.
        *
        * @param namespace
  -     * @param scope
  +     * @param uri
        */
       public UriTokenizer(Namespace namespace, String uri) {
           this(null, namespace, uri);
  
  
  
  No                   revision
  No                   revision
  1.12.2.1  +9 -8      jakarta-slide/src/share/org/apache/slide/content/Content.java
  
  Index: Content.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/content/Content.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- Content.java      12 Dec 2003 02:48:29 -0000      1.12
  +++ Content.java      30 Jan 2004 13:37:36 -0000      1.12.2.1
  @@ -122,10 +122,11 @@
       
       
       /**
  -     * Retrieve revision descriptor.
  -     * 
  +     * Retrieve revision descriptor from the latest revision
  +     * of a branch.
  +     * @param token The token to access slide
        * @param revisionDescriptors Node revision descriptors
  -     * @param revisionNumber Node revision number
  +     * @param branch The branch, that contains the revision.  
        */
       NodeRevisionDescriptor retrieve
           (SlideToken token, NodeRevisionDescriptors revisionDescriptors,
  @@ -235,7 +236,7 @@
        * 
        * @param strUri Uri
        * @param branchName Name of the new branch
  -     * @param basedOnRevisionDescriptor Node revision descriptor of
  +     * @param basedOnRevisionNumber Node revision number of
        *                                  the revision on which the new branch
        *                                  is based on.
        *
  
  
  
  1.50.2.2  +10 -9     
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
  
  Index: ContentImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
  retrieving revision 1.50.2.1
  retrieving revision 1.50.2.2
  diff -u -r1.50.2.1 -r1.50.2.2
  --- ContentImpl.java  22 Jan 2004 11:15:46 -0000      1.50.2.1
  +++ ContentImpl.java  30 Jan 2004 13:37:36 -0000      1.50.2.2
  @@ -129,7 +129,7 @@
        * @param namespace Namespace
        * @param namespaceConfig Namespace configuration
        * @param securityHelper Security helper
  -     * @param dataHelper Data helper
  +     * @param structureHelper Structure helper
        * @param lockHelper lockHelper
        */
       public ContentImpl(Namespace namespace, NamespaceConfig namespaceConfig,
  @@ -222,10 +222,11 @@
       
       
       /**
  -     * Retrieve revision descriptor.
  +     * Retrieve revision descriptor of the latest revision
  +     * from a branch.
        *
        * @param revisionDescriptors Node revision descriptors
  -     * @param revisionNumber Node revision number
  +     * @param branch Branch name
        */
       public NodeRevisionDescriptor retrieve
           (SlideToken token, NodeRevisionDescriptors revisionDescriptors,
  @@ -750,7 +751,7 @@
        *
        * @param strUri Uri
        * @param branchName Name of the new branch
  -     * @param basedOnRevisionDescriptor Node revision descriptor of
  +     * @param basedOnRevisionNumber Node revision number of
        *                                  the revision on which the new branch
        *                                  is based on.
        *
  @@ -1169,7 +1170,7 @@
        * Create new revision based on a previous revision.
        *
        * @param strUri Uri
  -     * @param oldRevisionDescriptor Node revision descriptor on which the
  +     * @param basedOnRevisionNumber Number of revision on which the
        * new revision is based
        * @param newRevisionDescriptor New revision descriptor
        * @param revisionContent Node revision content
  
  
  
  1.21.2.1  +6 -6      
jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java
  
  Index: NodeProperty.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeProperty.java,v
  retrieving revision 1.21
  retrieving revision 1.21.2.1
  diff -u -r1.21 -r1.21.2.1
  --- NodeProperty.java 12 Dec 2003 02:48:29 -0000      1.21
  +++ NodeProperty.java 30 Jan 2004 13:37:36 -0000      1.21.2.1
  @@ -186,7 +186,7 @@
        *
        * @param name Name
        * @param value Value
  -     * @param standard Standard
  +     * @param protectedProperty Is the property protected?
        */
       public NodeProperty(String name, Object value, boolean protectedProperty) {
           this(name, value);
  @@ -355,7 +355,7 @@
       /**
        * Namespace mutator.
        *
  -     * @param definition Namepsace
  +     * @param namespace New namespace
        */
       void setNamespace(String namespace) {
           if (namespace == null) {
  
  
  
  1.14.2.1  +5 -5      
jakarta-slide/src/share/org/apache/slide/content/NodeRevisionContent.java
  
  Index: NodeRevisionContent.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionContent.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- NodeRevisionContent.java  12 Dec 2003 02:48:29 -0000      1.14
  +++ NodeRevisionContent.java  30 Jan 2004 13:37:37 -0000      1.14.2.1
  @@ -279,7 +279,7 @@
       /**
        * Content mutator.
        *
  -     * @param content New content
  +     * @param contentBytes New content
        */
       public void setContent(byte[] contentBytes) {
           this.contentBytes = contentBytes;
  
  
  
  1.31.2.1  +11 -11    
jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java
  
  Index: NodeRevisionDescriptor.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/NodeRevisionDescriptor.java,v
  retrieving revision 1.31
  retrieving revision 1.31.2.1
  diff -u -r1.31 -r1.31.2.1
  --- NodeRevisionDescriptor.java       12 Dec 2003 02:48:29 -0000      1.31
  +++ NodeRevisionDescriptor.java       30 Jan 2004 13:37:37 -0000      1.31.2.1
  @@ -639,7 +639,7 @@
       /**
        * Set owner property.
        *
  -     * @param eTag  New etag
  +     * @param owner  New owner
        */
       public void setOwner(String owner) {
           setProperty(OWNER, owner);  // live property, can not be modified
  @@ -648,7 +648,7 @@
       /**
        * Set owner property.
        *
  -     * @param eTag  New etag
  +     * @param owner  New owner
        */
       public void setOwner(String owner, String userpath) {
           setProperty(OWNER, userpath + "/" + owner);  // live property, can not be 
modified
  @@ -670,9 +670,9 @@
       
       
       /**
  -     * Set owner property.
  +     * Set source property.
        *
  -     * @param eTag  New etag
  +     * @param source  New source
        */
       public void setSource(String source) {
           setProperty(SOURCE, source);  // live property, can not be modified
  @@ -701,7 +701,7 @@
       /**
        * Set ResourceType property.
        *
  -     * @param ResourceType  New ResourceType
  +     * @param resourceType  New ResourceType
        */
       public void setResourceType(String resourceType) {
           setProperty(RESOURCE_TYPE, resourceType);  // live property, can not be 
modified
  @@ -994,7 +994,7 @@
       /**
        * Creation length mutator.
        *
  -     * @param creationLength New content length
  +     * @param contentLength New content length
        */
       public void setContentLength(long contentLength) {
           setProperty(CONTENT_LENGTH, new Long(contentLength));  // live property, 
can not be modified
  @@ -1004,7 +1004,7 @@
       /**
        * Creation length mutator.
        *
  -     * @param creationLength New content length
  +     * @param contentLength New content length
        */
       public void setContentLength(String contentLength) {
           Long contentLengthValue = null;
  
  
  
  1.4.2.1   +5 -5      
jakarta-slide/src/share/org/apache/slide/content/RevisionAlreadyExistException.java
  
  Index: RevisionAlreadyExistException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/RevisionAlreadyExistException.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RevisionAlreadyExistException.java        25 Apr 2002 21:30:14 -0000      1.4
  +++ RevisionAlreadyExistException.java        30 Jan 2004 13:37:37 -0000      1.4.2.1
  @@ -81,7 +81,7 @@
        * Constructor.
        * 
        * @param objectUri Uri of the object
  -     * @param id Revision Id
  +     * @param number Revision number 
        */
       public RevisionAlreadyExistException(String objectUri, 
                                            NodeRevisionNumber number) {
  
  
  
  1.5.2.1   +5 -5      
jakarta-slide/src/share/org/apache/slide/content/RevisionNotFoundException.java
  
  Index: RevisionNotFoundException.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/RevisionNotFoundException.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- RevisionNotFoundException.java    12 Dec 2003 02:48:29 -0000      1.5
  +++ RevisionNotFoundException.java    30 Jan 2004 13:37:37 -0000      1.5.2.1
  @@ -81,7 +81,7 @@
        * Constructor.
        * 
        * @param objectUri Uri of the object
  -     * @param id Id of the revision
  +     * @param number Number of the revision
        */
       public RevisionNotFoundException(String objectUri, 
                                        NodeRevisionNumber number) {
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +6 -6      
jakarta-slide/src/share/org/apache/slide/macro/CopyRouteRedirector.java
  
  Index: CopyRouteRedirector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/CopyRouteRedirector.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- CopyRouteRedirector.java  8 May 2002 07:21:47 -0000       1.3
  +++ CopyRouteRedirector.java  30 Jan 2004 13:37:37 -0000      1.3.2.1
  @@ -195,7 +195,7 @@
       /**
        * Returns the (redirected) CopyRoute to use. Must not be <code>null</code>.
        *
  -     * @param      the original CopyRoute.
  +     * @param      copyRoute the original CopyRoute.
        *
        * @return     the (redirected) CopyRoute to use.
        *
  
  
  
  1.1.2.1   +5 -5      
jakarta-slide/src/share/org/apache/slide/macro/DeleteTargetRedirector.java
  
  Index: DeleteTargetRedirector.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/DeleteTargetRedirector.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- DeleteTargetRedirector.java       7 May 2002 07:28:23 -0000       1.1
  +++ DeleteTargetRedirector.java       30 Jan 2004 13:37:37 -0000      1.1.2.1
  @@ -79,7 +79,7 @@
       /**
        * Returns the (redirected) target Uri to use. Must not be <code>null</code>.
        *
  -     * @param      the original target Uri.
  +     * @param      targetUri the original target Uri.
        *
        * @return     the (redirected) target Uri to use.
        *
  
  
  
  No                   revision
  No                   revision
  1.14.2.1  +5 -5      jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java
  
  Index: SearchImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/search/SearchImpl.java,v
  retrieving revision 1.14
  retrieving revision 1.14.2.1
  diff -u -r1.14 -r1.14.2.1
  --- SearchImpl.java   12 Dec 2003 02:48:30 -0000      1.14
  +++ SearchImpl.java   30 Jan 2004 13:37:37 -0000      1.14.2.1
  @@ -153,7 +153,7 @@
        * Search.
        *
        * @param token Credentials token
  -     * @param object Object on which permission is granted
  +     * @param query The query to execute
        * @exception ServiceAccessException DataSource access error
        */
       public SearchQueryResult search (SlideToken token, SearchQuery query)
  
  
  
  No                   revision
  No                   revision
  1.44.2.1  +9 -14     
jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java
  
  Index: SecurityImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/security/SecurityImpl.java,v
  retrieving revision 1.44
  retrieving revision 1.44.2.1
  diff -u -r1.44 -r1.44.2.1
  --- SecurityImpl.java 17 Jan 2004 21:48:00 -0000      1.44
  +++ SecurityImpl.java 30 Jan 2004 13:37:37 -0000      1.44.2.1
  @@ -113,9 +113,6 @@
       
       /**
        * Constructor.
  -     *
  -     * @param namespace Namespace
  -     * @param namespaceConfig Namespace configuration
        */
       public SecurityImpl() {}
       
  @@ -210,9 +207,8 @@
        *
        * @param token Credentials token
        * @param object Object on which permission is granted
  -     * @param activity Activity which the actor can perform
  -     * @param collection Collection on which the actor can perform
  -     * the specified action
  +     * @param subject The subject to whom the permission is granted.
  +     * @param action The action which the subject can perform
        * @exception ServiceAccessException DataSource access error
        * @exception ObjectNotFoundException Specified object was not found
        * in the DataSource
  @@ -289,10 +285,9 @@
        * Deny a new permission.
        *
        * @param token Credentials token
  -     * @param object Object on which permission is granted
  -     * @param activity Activity which the actor can perform
  -     * @param collection Collection on which the actor can perform
  -     * the specified action
  +     * @param object Object on which permission is denied
  +     * @param subject The subject to whom a action is denied
  +     * @param action The action which is denied
        * @exception ServiceAccessException DataSource access error
        * @exception ObjectNotFoundException Specified object was not found
        * in the DataSource
  
  
  
  No                   revision
  No                   revision
  1.9.2.1   +5 -5      
jakarta-slide/src/share/org/apache/slide/util/HashMapObjectCache.java
  
  Index: HashMapObjectCache.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/HashMapObjectCache.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- HashMapObjectCache.java   12 Dec 2003 02:48:31 -0000      1.9
  +++ HashMapObjectCache.java   30 Jan 2004 13:37:37 -0000      1.9.2.1
  @@ -139,7 +139,7 @@
        * Add an object to the cache, or overwrite its value.
        * 
        * @param key Object's key
  -     * @param object Object's value
  +     * @param value Object's value
        */
       public void put(Object key, Object value) {
           synchronized (cache) {
  
  
  
  1.6.2.1   +5 -5      jakarta-slide/src/share/org/apache/slide/util/Messages.java
  
  Index: Messages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/util/Messages.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- Messages.java     25 Apr 2002 21:30:16 -0000      1.6
  +++ Messages.java     30 Jan 2004 13:37:37 -0000      1.6.2.1
  @@ -146,7 +146,7 @@
        * Format a message.
        * 
        * @param message Message to format
  -     * @param arg1 Argument array
  +     * @param args Argument array
        */
       public static String format( String message, Object[] args )
       {
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +4 -4      
jakarta-slide/src/share/org/apache/slide/util/conf/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/conf/Configuration.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- Configuration.java        12 Jun 2002 17:34:13 -0000      1.3
  +++ Configuration.java        30 Jan 2004 13:37:37 -0000      1.3.2.1
  @@ -146,7 +146,7 @@
        *                                   or if conversion to <code>long</code>
        *                                   fails.
        */
  -    public long getAttributeAsLong(String name)
  +    public long getAttributeAsLong(String paramName)
           throws ConfigurationException;
       
       /**
  
  
  
  No                   revision
  No                   revision
  1.7.2.1   +8 -9      jakarta-slide/src/share/org/apache/slide/util/logger/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/share/org/apache/slide/util/logger/Logger.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- Logger.java       3 Dec 2003 10:59:57 -0000       1.7
  +++ Logger.java       30 Jan 2004 13:37:37 -0000      1.7.2.1
  @@ -273,7 +273,7 @@
       /**
        * Set the logger level for the default channel
        *
  -     * @param data The object to log.
  +     * @param level The new log level
        */
   
       public void setLoggerLevel(int level);
  @@ -283,7 +283,8 @@
       /**
        * Set the logger level for the specified channel
        *
  -     * @param data The object to log.
  +     * @param channel The channel for which the level is set.
  +     * @param level The new log level
        */
   
       public void setLoggerLevel(String channel, int level);
  @@ -292,8 +293,6 @@
       
       /**
        * Get the logger level for the default channel
  -     *
  -     * @param data The object to log.
        */
   
       public int getLoggerLevel();
  @@ -303,7 +302,7 @@
       /**
        * Get the logger level for the specified channel
        *
  -     * @param data The object to log.
  +     * @param channel The channel whose log level is returned.
        */
   
       public int getLoggerLevel(String channel);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to