You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2010/09/21 00:30:34 UTC

svn commit: r999149 - in /incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec: security/proxytrust/util/ security/security/ servicediscovery/ servicediscovery/cache/ servicediscovery/event/ servicediscovery/lookup/ url/httpmd/handler/

Author: jcosters
Date: Mon Sep 20 22:30:33 2010
New Revision: 999149

URL: http://svn.apache.org/viewvc?rev=999149&view=rev
Log:
RIVER-351: fix some javadoc generation warnings for the qa subproject

Modified:
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
    incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java Mon Sep 20 22:30:33 2010
@@ -208,7 +208,7 @@ public abstract class AbstractTestBase e
     /**
      * Creates main proxy.
      *
-     * @param implementation
+     * @param impl
      * @return proxy created
      */
     public RemoteMethodControl newMainProxy(Object impl) {
@@ -221,7 +221,7 @@ public abstract class AbstractTestBase e
     /**
      * Creates main proxy in RMI child loader.
      *
-     * @param implementation
+     * @param impl
      * @return proxy created
      */
     public RemoteMethodControl newRMIMainProxy(Object impl) {
@@ -243,7 +243,7 @@ public abstract class AbstractTestBase e
     /**
      * Creates boot proxy.
      *
-     * @param implementation
+     * @param impl
      * @return proxy created
      */
     public ProxyTrust newBootProxy(Object impl) {
@@ -259,7 +259,7 @@ public abstract class AbstractTestBase e
      *
      * @param obj object for checking
      * @param value expected value
-     * @returns true if obj != null, is instance of Boolean and equal to value
+     * @return true if obj != null, is instance of Boolean and equal to value
      *          and false otherwise
      */
     public boolean isOk(Object obj, boolean value) {

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java Mon Sep 20 22:30:33 2010
@@ -99,7 +99,7 @@ public abstract class BaseTrustVerifierC
     /**
      * Method from TrustVerifier.Context interface. Does nothing.
      *
-     * @returns null
+     * @return null
      */
     public ClassLoader getClassLoader() {
         return null;

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java Mon Sep 20 22:30:33 2010
@@ -54,7 +54,7 @@ public class IHandlerThrowingRE extends 
      * Specially treat only Object.toString method.
      *
      * @param proxy the proxy object
-     * @param method the method being invoked
+     * @param m the method being invoked
      * @param args the arguments to the specified method
      * @return the value returned by executing the specified method on
      *         the specified proxy with the specified arguments, or null

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java Mon Sep 20 22:30:33 2010
@@ -54,7 +54,7 @@ public class IHandlerThrowingSE extends 
      * Specially treat only Object.toString method.
      *
      * @param proxy the proxy object
-     * @param method the method being invoked
+     * @param m the method being invoked
      * @param args the arguments to the specified method
      * @return the value returned by executing the specified method on
      *         the specified proxy with the specified arguments, or null

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java Mon Sep 20 22:30:33 2010
@@ -48,7 +48,7 @@ public class InvHandler implements Invoc
      * Specially treat only Object.equals method.
      *
      * @param proxy the proxy object
-     * @param method the method being invoked
+     * @param m the method being invoked
      * @param args the arguments to the specified method
      * @return the value returned by executing the specified method on
      *         the specified proxy with the specified arguments, or null

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java Mon Sep 20 22:30:33 2010
@@ -33,8 +33,6 @@ public class NonProxyObjectThrowingRE ex
 
     /**
      * Store given array of objects and creates TrustIterator.
-     *
-     * @param objs array of objects
      */
     public NonProxyObjectThrowingRE() {
         super(new Object[] { new Object() });

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java Mon Sep 20 22:30:33 2010
@@ -57,7 +57,7 @@ public class ValidIHandler extends Valid
      * Specially treat only Object.toString method.
      *
      * @param proxy the proxy object
-     * @param method the method being invoked
+     * @param m the method being invoked
      * @param args the arguments to the specified method
      * @return the value returned by executing the specified method on
      *         the specified proxy with the specified arguments, or null

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java Mon Sep 20 22:30:33 2010
@@ -54,7 +54,7 @@ public class WrongMethodIHandler extends
      * Specially treat only Object.toString method.
      *
      * @param proxy the proxy object
-     * @param method the method being invoked
+     * @param m the method being invoked
      * @param args the arguments to the specified method
      * @return the value returned by executing the specified method on
      *         the specified proxy with the specified arguments, or null

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java Mon Sep 20 22:30:33 2010
@@ -326,7 +326,7 @@ public class VerifyCodebaseIntegrityTest
      * classes whose 'providesIntegrity' methods are expected to be called.
      *
      * @param clNames array of classes for which evaluate the result
-     * @param urls URLs string for which get expected results
+     * @param str URLs string for which get expected results
      * @throws MalformedURLException if any of the URLs are invalid
      */
     protected Class getExpRes(Class[] clNames, String str)

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java Mon Sep 20 22:30:33 2010
@@ -602,9 +602,6 @@ abstract public class AbstractBaseTest e
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     abstract protected void applyTestDef() throws Exception;
 

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java Mon Sep 20 22:30:33 2010
@@ -72,9 +72,6 @@ public class DefaultDiscoverPublic exten
      *  2. Retrieves the set of groups the lookup discovery manager is
      *     configured to discover. 
      *  3. Verifies the set of groups contains only the public group.
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         DiscoveryManagement dm = srvcDiscoveryMgr.getDiscoveryManager();

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java Mon Sep 20 22:30:33 2010
@@ -97,9 +97,6 @@ public class AddListenerNPE extends Abst
      *     a <code>NullPointerException</code> is not always thrown.
      *  3. Attempts to add a <code>null</code> listener
      *  4. Verifies that a <code>NullPointerException</code> is thrown.
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
 	logger.log(Level.FINE, "requesting a lookup cache");

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java Mon Sep 20 22:30:33 2010
@@ -58,9 +58,6 @@ public class CacheDiscard extends CacheL
      *  3. Discards the retrieved service.
      *  4. Queries the cache again to verify that the service has indeed
      *     been discarded as expected.
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Query the cache for the desired registered service. */

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java Mon Sep 20 22:30:33 2010
@@ -87,9 +87,6 @@ public class CacheLookup extends Abstrac
      *     applying NO second-stage filtering (<code>null</code> filter 
      *     parameter) - to query the cache for the desired expected service
      *  3. Verifies that the service returned is the service expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Create a cache for the services that were registered. */

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java Mon Sep 20 22:30:33 2010
@@ -93,9 +93,6 @@ public class CacheLookupFilterFilter ext
      *     of the template matching and the first-stage filtering - to query
      *     the cache for the desired expected service
      *  3. Verifies that the service returned is the service expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Create the cache and verify it returns a registered service. */ 

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java Mon Sep 20 22:30:33 2010
@@ -81,9 +81,6 @@ public class CacheLookupFilterNoFilter e
      *     applying NO second-stage filtering (<code>null</code> filter 
      *     parameter) - to query the cache for the desired expected service
      *  3. Verifies that the service returned is the service expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Create the cache and verify it returns a registered service. */ 

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java Mon Sep 20 22:30:33 2010
@@ -109,9 +109,6 @@ public class ModifyAttrServiceChanged ex
      *     or augmentation, and verifies that the expected number of 
      *     serviceChanged/serviceRemoved/serviceAdded events are sent by
      *     the cache's event mechanism.
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         registerAndVerify(waitDur);
@@ -122,9 +119,6 @@ public class ModifyAttrServiceChanged ex
     /** Verifies the number of added, removed, and changed events expected
      *  to have been received by the listener are each equal to the expected
      *  value at the time this method is called.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if conditions indicate success.
      */
     protected void verifyCurrentEvents() throws Exception {
         verifyCurrentEvents(nAddedExpected,
@@ -206,9 +200,6 @@ public class ModifyAttrServiceChanged ex
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if there was no problem.
      */
     protected void changeAttrAndVerify() throws Exception {
         synchronized(regInfoMap) {
@@ -306,9 +297,6 @@ public class ModifyAttrServiceChanged ex
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if there was no problem.
      */
     protected void createCacheAndVerify() throws Exception {
         createCacheAndVerify(template);
@@ -356,9 +344,6 @@ public class ModifyAttrServiceChanged ex
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if there was no problem.
      */
     protected void registerAndVerify(long waitDur) throws Exception {
         if(nServices <= 0) throw new TestException

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java Mon Sep 20 22:30:33 2010
@@ -74,9 +74,6 @@ public class Lookup extends AbstractBase
      *     (<code>null</code> filter parameter) - to query the discovered
      *     lookup services for the desired service. 
      *  2. Verifies that the service returned is the service expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Through the service discovery manager, query the discovered lookup

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java Mon Sep 20 22:30:33 2010
@@ -90,9 +90,6 @@ public class LookupFilter extends Lookup
      *     during setup - to query the discovered lookup services for the
      *     desired service. 
      *  2. Verifies that the service returned is the service expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* The version of lookup() being tested here returns 1 arbitrarily

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java Mon Sep 20 22:30:33 2010
@@ -67,9 +67,6 @@ public class LookupMax extends Lookup {
      *     (<code>null</code> filter parameter) - to query the discovered
      *     lookup services for the desired services. 
      *  2. Verifies that the services returned are the services expected
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Through the service discovery manager, query the discovered lookup

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java Mon Sep 20 22:30:33 2010
@@ -105,9 +105,6 @@ public class LookupMinEqualsMax extends 
      *  2. Verifies that the services returned are the services expected,
      *     and the <code>lookup</code> method blocks for the expected
      *     amount of time
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Verify blocking mechanism for less than min registered services */
@@ -140,9 +137,6 @@ public class LookupMinEqualsMax extends 
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if there was no problem.
      */
     protected void verifyBlocking(int startVal,int nSrvcs,long waitDur) 
 	throws Exception

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java Mon Sep 20 22:30:33 2010
@@ -79,9 +79,6 @@ public class LookupMinMaxNoBlock extends
      *  2. Verifies that the services returned are the services expected,
      *     and the <code>lookup</code> method returns immediately without
      *     blocking
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Verify immediate return when more than minMatches services are

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java Mon Sep 20 22:30:33 2010
@@ -100,9 +100,6 @@ public class LookupWait extends Abstract
      *     returned is the service expected, and the <code>lookup</code>
      *     method blocks until the registration of the desired service 
      *     has completed successfully
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Verify blocking mechanism in the absense of registered services */
@@ -133,9 +130,6 @@ public class LookupWait extends Abstract
      *  If the <code>String</code> returned by this method is 
      *  non-<code>null</code>, then the test should declare failure and
      *  display the value returned by this method.
-     *
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if there was no problem.
      */
     protected void verifyBlocking(int nSrvcs,int nAttrs,long waitDur) 
 	throws Exception

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java Mon Sep 20 22:30:33 2010
@@ -86,9 +86,6 @@ public class LookupWaitFilter extends Lo
      *     rejects the services that would normally be discovered if the
      *     filter were not applied, the call to the <code>lookup</code>
      *     method blocks for the full amount of time requested
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         /* Verify blocking mechanism in the absense of registered services */

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java Mon Sep 20 22:30:33 2010
@@ -86,9 +86,6 @@ public class LookupWaitNoBlock extends L
      *  2. Verifies that the service returned is the service expected,
      *     and the <code>lookup</code> method returns immediately without
      *     blocking
-     * 
-     *  @return a <code>String</code> containing a failure message, or
-     *           <code>null</code> if the test was successful.
      */
     protected void applyTestDef() throws Exception {
         long waitDur = 30*1000;

Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java?rev=999149&r1=999148&r2=999149&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java (original)
+++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java Mon Sep 20 22:30:33 2010
@@ -22,6 +22,8 @@ import java.util.logging.Level;
 
 // java.net
 import java.net.URL;
+import java.net.URLStreamHandler;
+import net.jini.url.httpmd.Handler;
 
 
 /**
@@ -30,7 +32,7 @@ import java.net.URL;
  * Purpose:
  *   This test verifies the behavior of {@link URL#equals(Object)} method
  *   for HTTPMD URL objects.
- *   {@link Handler#sameFile(URL,URL)} method is
+ *   {@link Handler#sameFile(java.net.URL, java.net.URL)} method is
  *   used to see if these HTTPMD URL objects refer to
  *   the same file using the following rules:
  *     - case-insensitive comparison of the protocols and of the
@@ -44,7 +46,7 @@ import java.net.URL;
  *   {@link URL#equals(Object)} method. {@link URL#equals(Object)} method
  *   invokes {@link Handler#equals(URL,URL)} method inherited
  *   from {@link URLStreamHandler} class.
- *   {@link URLStreamHandler#equals(URL,URL)} method uses
+ *   {@link URLStreamHandler#equals(java.net.URL, java.net.URL)} method uses
  *   {@link Handler#sameFile(URL,URL)} method to compare
  *   HTTPMD URL objects.
  *   The cases:



Re: svn commit: r999149 - in /incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec: security/proxytrust/util/ security/security/ servicediscovery/ servicediscovery/cache/ servicediscovery/event/ servicediscovery/lookup/ url/httpmd/handler/

Posted by Jonathan Costers <jo...@googlemail.com>.
not quite there yet .. but its a start

2010/9/21 Peter Firmstone <ji...@zeus.net.au>

> Good work fixing all those annoying errors ;)
>
> Just thought I'd focus on the positive too; all the effort your putting in
> lately.
>
> Cheers,
>
> Peter.
>
>
> jcosters@apache.org wrote:
>
>> Author: jcosters
>> Date: Mon Sep 20 22:30:33 2010
>> New Revision: 999149
>>
>> URL: http://svn.apache.org/viewvc?rev=999149&view=rev
>> Log:
>> RIVER-351: fix some javadoc generation warnings for the qa subproject
>>
>> Modified:
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
>>
>>  incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
>> Mon Sep 20 22:30:33 2010
>> @@ -208,7 +208,7 @@ public abstract class AbstractTestBase e
>>     /**
>>      * Creates main proxy.
>>      *
>> -     * @param implementation
>> +     * @param impl
>>      * @return proxy created
>>      */
>>     public RemoteMethodControl newMainProxy(Object impl) {
>> @@ -221,7 +221,7 @@ public abstract class AbstractTestBase e
>>     /**
>>      * Creates main proxy in RMI child loader.
>>      *
>> -     * @param implementation
>> +     * @param impl
>>      * @return proxy created
>>      */
>>     public RemoteMethodControl newRMIMainProxy(Object impl) {
>> @@ -243,7 +243,7 @@ public abstract class AbstractTestBase e
>>     /**
>>      * Creates boot proxy.
>>      *
>> -     * @param implementation
>> +     * @param impl
>>      * @return proxy created
>>      */
>>     public ProxyTrust newBootProxy(Object impl) {
>> @@ -259,7 +259,7 @@ public abstract class AbstractTestBase e
>>      *
>>      * @param obj object for checking
>>      * @param value expected value
>> -     * @returns true if obj != null, is instance of Boolean and equal to
>> value
>> +     * @return true if obj != null, is instance of Boolean and equal to
>> value
>>      *          and false otherwise
>>      */
>>     public boolean isOk(Object obj, boolean value) {
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
>> Mon Sep 20 22:30:33 2010
>> @@ -99,7 +99,7 @@ public abstract class BaseTrustVerifierC
>>     /**
>>      * Method from TrustVerifier.Context interface. Does nothing.
>>      *
>> -     * @returns null
>> +     * @return null
>>      */
>>     public ClassLoader getClassLoader() {
>>         return null;
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
>> Mon Sep 20 22:30:33 2010
>> @@ -54,7 +54,7 @@ public class IHandlerThrowingRE extends       *
>> Specially treat only Object.toString method.
>>      *
>>      * @param proxy the proxy object
>> -     * @param method the method being invoked
>> +     * @param m the method being invoked
>>      * @param args the arguments to the specified method
>>      * @return the value returned by executing the specified method on
>>      *         the specified proxy with the specified arguments, or null
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
>> Mon Sep 20 22:30:33 2010
>> @@ -54,7 +54,7 @@ public class IHandlerThrowingSE extends       *
>> Specially treat only Object.toString method.
>>      *
>>      * @param proxy the proxy object
>> -     * @param method the method being invoked
>> +     * @param m the method being invoked
>>      * @param args the arguments to the specified method
>>      * @return the value returned by executing the specified method on
>>      *         the specified proxy with the specified arguments, or null
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
>> Mon Sep 20 22:30:33 2010
>> @@ -48,7 +48,7 @@ public class InvHandler implements Invoc
>>      * Specially treat only Object.equals method.
>>      *
>>      * @param proxy the proxy object
>> -     * @param method the method being invoked
>> +     * @param m the method being invoked
>>      * @param args the arguments to the specified method
>>      * @return the value returned by executing the specified method on
>>      *         the specified proxy with the specified arguments, or null
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
>> Mon Sep 20 22:30:33 2010
>> @@ -33,8 +33,6 @@ public class NonProxyObjectThrowingRE ex
>>      /**
>>      * Store given array of objects and creates TrustIterator.
>> -     *
>> -     * @param objs array of objects
>>      */
>>     public NonProxyObjectThrowingRE() {
>>         super(new Object[] { new Object() });
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
>> Mon Sep 20 22:30:33 2010
>> @@ -57,7 +57,7 @@ public class ValidIHandler extends Valid
>>      * Specially treat only Object.toString method.
>>      *
>>      * @param proxy the proxy object
>> -     * @param method the method being invoked
>> +     * @param m the method being invoked
>>      * @param args the arguments to the specified method
>>      * @return the value returned by executing the specified method on
>>      *         the specified proxy with the specified arguments, or null
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
>> Mon Sep 20 22:30:33 2010
>> @@ -54,7 +54,7 @@ public class WrongMethodIHandler extends
>>      * Specially treat only Object.toString method.
>>      *
>>      * @param proxy the proxy object
>> -     * @param method the method being invoked
>> +     * @param m the method being invoked
>>      * @param args the arguments to the specified method
>>      * @return the value returned by executing the specified method on
>>      *         the specified proxy with the specified arguments, or null
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
>> Mon Sep 20 22:30:33 2010
>> @@ -326,7 +326,7 @@ public class VerifyCodebaseIntegrityTest
>>      * classes whose 'providesIntegrity' methods are expected to be
>> called.
>>      *
>>      * @param clNames array of classes for which evaluate the result
>> -     * @param urls URLs string for which get expected results
>> +     * @param str URLs string for which get expected results
>>      * @throws MalformedURLException if any of the URLs are invalid
>>      */
>>     protected Class getExpRes(Class[] clNames, String str)
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
>> Mon Sep 20 22:30:33 2010
>> @@ -602,9 +602,6 @@ abstract public class AbstractBaseTest e
>>      *  If the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     abstract protected void applyTestDef() throws Exception;
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
>> Mon Sep 20 22:30:33 2010
>> @@ -72,9 +72,6 @@ public class DefaultDiscoverPublic exten
>>      *  2. Retrieves the set of groups the lookup discovery manager is
>>      *     configured to discover.       *  3. Verifies the set of groups
>> contains only the public group.
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         DiscoveryManagement dm = srvcDiscoveryMgr.getDiscoveryManager();
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
>> Mon Sep 20 22:30:33 2010
>> @@ -97,9 +97,6 @@ public class AddListenerNPE extends Abst
>>      *     a <code>NullPointerException</code> is not always thrown.
>>      *  3. Attempts to add a <code>null</code> listener
>>      *  4. Verifies that a <code>NullPointerException</code> is thrown.
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>        logger.log(Level.FINE, "requesting a lookup cache");
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
>> Mon Sep 20 22:30:33 2010
>> @@ -58,9 +58,6 @@ public class CacheDiscard extends CacheL
>>      *  3. Discards the retrieved service.
>>      *  4. Queries the cache again to verify that the service has indeed
>>      *     been discarded as expected.
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Query the cache for the desired registered service. */
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
>> Mon Sep 20 22:30:33 2010
>> @@ -87,9 +87,6 @@ public class CacheLookup extends Abstrac
>>      *     applying NO second-stage filtering (<code>null</code> filter
>>     *     parameter) - to query the cache for the desired expected service
>>      *  3. Verifies that the service returned is the service expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Create a cache for the services that were registered. */
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
>> Mon Sep 20 22:30:33 2010
>> @@ -93,9 +93,6 @@ public class CacheLookupFilterFilter ext
>>      *     of the template matching and the first-stage filtering - to
>> query
>>      *     the cache for the desired expected service
>>      *  3. Verifies that the service returned is the service expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Create the cache and verify it returns a registered service. */
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
>> Mon Sep 20 22:30:33 2010
>> @@ -81,9 +81,6 @@ public class CacheLookupFilterNoFilter e
>>      *     applying NO second-stage filtering (<code>null</code> filter
>>     *     parameter) - to query the cache for the desired expected service
>>      *  3. Verifies that the service returned is the service expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Create the cache and verify it returns a registered service. */
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
>> Mon Sep 20 22:30:33 2010
>> @@ -109,9 +109,6 @@ public class ModifyAttrServiceChanged ex
>>      *     or augmentation, and verifies that the expected number of
>> *     serviceChanged/serviceRemoved/serviceAdded events are sent by
>>      *     the cache's event mechanism.
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         registerAndVerify(waitDur);
>> @@ -122,9 +119,6 @@ public class ModifyAttrServiceChanged ex
>>     /** Verifies the number of added, removed, and changed events expected
>>      *  to have been received by the listener are each equal to the
>> expected
>>      *  value at the time this method is called.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if conditions indicate success.
>>      */
>>     protected void verifyCurrentEvents() throws Exception {
>>         verifyCurrentEvents(nAddedExpected,
>> @@ -206,9 +200,6 @@ public class ModifyAttrServiceChanged ex
>>      *  If the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if there was no problem.
>>      */
>>     protected void changeAttrAndVerify() throws Exception {
>>         synchronized(regInfoMap) {
>> @@ -306,9 +297,6 @@ public class ModifyAttrServiceChanged ex
>>      *  If the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if there was no problem.
>>      */
>>     protected void createCacheAndVerify() throws Exception {
>>         createCacheAndVerify(template);
>> @@ -356,9 +344,6 @@ public class ModifyAttrServiceChanged ex
>>      *  If the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if there was no problem.
>>      */
>>     protected void registerAndVerify(long waitDur) throws Exception {
>>         if(nServices <= 0) throw new TestException
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
>> Mon Sep 20 22:30:33 2010
>> @@ -74,9 +74,6 @@ public class Lookup extends AbstractBase
>>      *     (<code>null</code> filter parameter) - to query the discovered
>>      *     lookup services for the desired service.       *  2. Verifies
>> that the service returned is the service expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Through the service discovery manager, query the discovered
>> lookup
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
>> Mon Sep 20 22:30:33 2010
>> @@ -90,9 +90,6 @@ public class LookupFilter extends Lookup
>>      *     during setup - to query the discovered lookup services for the
>>      *     desired service.       *  2. Verifies that the service returned
>> is the service expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* The version of lookup() being tested here returns 1 arbitrarily
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
>> Mon Sep 20 22:30:33 2010
>> @@ -67,9 +67,6 @@ public class LookupMax extends Lookup {
>>      *     (<code>null</code> filter parameter) - to query the discovered
>>      *     lookup services for the desired services.       *  2. Verifies
>> that the services returned are the services expected
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Through the service discovery manager, query the discovered
>> lookup
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
>> Mon Sep 20 22:30:33 2010
>> @@ -105,9 +105,6 @@ public class LookupMinEqualsMax extends       *  2.
>> Verifies that the services returned are the services expected,
>>      *     and the <code>lookup</code> method blocks for the expected
>>      *     amount of time
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Verify blocking mechanism for less than min registered services
>> */
>> @@ -140,9 +137,6 @@ public class LookupMinEqualsMax extends       *  If
>> the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if there was no problem.
>>      */
>>     protected void verifyBlocking(int startVal,int nSrvcs,long waitDur)
>>      throws Exception
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
>> Mon Sep 20 22:30:33 2010
>> @@ -79,9 +79,6 @@ public class LookupMinMaxNoBlock extends
>>      *  2. Verifies that the services returned are the services expected,
>>      *     and the <code>lookup</code> method returns immediately without
>>      *     blocking
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Verify immediate return when more than minMatches services are
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
>> Mon Sep 20 22:30:33 2010
>> @@ -100,9 +100,6 @@ public class LookupWait extends Abstract
>>      *     returned is the service expected, and the <code>lookup</code>
>>      *     method blocks until the registration of the desired service
>>   *     has completed successfully
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Verify blocking mechanism in the absense of registered services
>> */
>> @@ -133,9 +130,6 @@ public class LookupWait extends Abstract
>>      *  If the <code>String</code> returned by this method is       *
>>  non-<code>null</code>, then the test should declare failure and
>>      *  display the value returned by this method.
>> -     *
>> -     *  @return a <code>String</code> containing a failure message, or
>> -     *           <code>null</code> if there was no problem.
>>      */
>>     protected void verifyBlocking(int nSrvcs,int nAttrs,long waitDur)
>>      throws Exception
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
>> Mon Sep 20 22:30:33 2010
>> @@ -86,9 +86,6 @@ public class LookupWaitFilter extends Lo
>>      *     rejects the services that would normally be discovered if the
>>      *     filter were not applied, the call to the <code>lookup</code>
>>      *     method blocks for the full amount of time requested
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         /* Verify blocking mechanism in the absense of registered services
>> */
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
>> Mon Sep 20 22:30:33 2010
>> @@ -86,9 +86,6 @@ public class LookupWaitNoBlock extends L
>>      *  2. Verifies that the service returned is the service expected,
>>      *     and the <code>lookup</code> method returns immediately without
>>      *     blocking
>> -     * -     *  @return a <code>String</code> containing a failure
>> message, or
>> -     *           <code>null</code> if the test was successful.
>>      */
>>     protected void applyTestDef() throws Exception {
>>         long waitDur = 30*1000;
>>
>> Modified:
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
>> URL:
>> http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java?rev=999149&r1=999148&r2=999149&view=diff
>>
>> ==============================================================================
>> ---
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
>> (original)
>> +++
>> incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
>> Mon Sep 20 22:30:33 2010
>> @@ -22,6 +22,8 @@ import java.util.logging.Level;
>>  // java.net
>>  import java.net.URL;
>> +import java.net.URLStreamHandler;
>> +import net.jini.url.httpmd.Handler;
>>   /**
>> @@ -30,7 +32,7 @@ import java.net.URL;
>>  * Purpose:
>>  *   This test verifies the behavior of {@link URL#equals(Object)} method
>>  *   for HTTPMD URL objects.
>> - *   {@link Handler#sameFile(URL,URL)} method is
>> + *   {@link Handler#sameFile(java.net.URL, java.net.URL)} method is
>>  *   used to see if these HTTPMD URL objects refer to
>>  *   the same file using the following rules:
>>  *     - case-insensitive comparison of the protocols and of the
>> @@ -44,7 +46,7 @@ import java.net.URL;
>>  *   {@link URL#equals(Object)} method. {@link URL#equals(Object)} method
>>  *   invokes {@link Handler#equals(URL,URL)} method inherited
>>  *   from {@link URLStreamHandler} class.
>> - *   {@link URLStreamHandler#equals(URL,URL)} method uses
>> + *   {@link URLStreamHandler#equals(java.net.URL, java.net.URL)} method
>> uses
>>  *   {@link Handler#sameFile(URL,URL)} method to compare
>>  *   HTTPMD URL objects.
>>  *   The cases:
>>
>>
>>
>>
>>
>
>

Re: svn commit: r999149 - in /incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec: security/proxytrust/util/ security/security/ servicediscovery/ servicediscovery/cache/ servicediscovery/event/ servicediscovery/lookup/ url/httpmd/handler/

Posted by Peter Firmstone <ji...@zeus.net.au>.
Good work fixing all those annoying errors ;)

Just thought I'd focus on the positive too; all the effort your putting 
in lately.

Cheers,

Peter.

jcosters@apache.org wrote:
> Author: jcosters
> Date: Mon Sep 20 22:30:33 2010
> New Revision: 999149
>
> URL: http://svn.apache.org/viewvc?rev=999149&view=rev
> Log:
> RIVER-351: fix some javadoc generation warnings for the qa subproject
>
> Modified:
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
>     incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/AbstractTestBase.java Mon Sep 20 22:30:33 2010
> @@ -208,7 +208,7 @@ public abstract class AbstractTestBase e
>      /**
>       * Creates main proxy.
>       *
> -     * @param implementation
> +     * @param impl
>       * @return proxy created
>       */
>      public RemoteMethodControl newMainProxy(Object impl) {
> @@ -221,7 +221,7 @@ public abstract class AbstractTestBase e
>      /**
>       * Creates main proxy in RMI child loader.
>       *
> -     * @param implementation
> +     * @param impl
>       * @return proxy created
>       */
>      public RemoteMethodControl newRMIMainProxy(Object impl) {
> @@ -243,7 +243,7 @@ public abstract class AbstractTestBase e
>      /**
>       * Creates boot proxy.
>       *
> -     * @param implementation
> +     * @param impl
>       * @return proxy created
>       */
>      public ProxyTrust newBootProxy(Object impl) {
> @@ -259,7 +259,7 @@ public abstract class AbstractTestBase e
>       *
>       * @param obj object for checking
>       * @param value expected value
> -     * @returns true if obj != null, is instance of Boolean and equal to value
> +     * @return true if obj != null, is instance of Boolean and equal to value
>       *          and false otherwise
>       */
>      public boolean isOk(Object obj, boolean value) {
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/BaseTrustVerifierContext.java Mon Sep 20 22:30:33 2010
> @@ -99,7 +99,7 @@ public abstract class BaseTrustVerifierC
>      /**
>       * Method from TrustVerifier.Context interface. Does nothing.
>       *
> -     * @returns null
> +     * @return null
>       */
>      public ClassLoader getClassLoader() {
>          return null;
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingRE.java Mon Sep 20 22:30:33 2010
> @@ -54,7 +54,7 @@ public class IHandlerThrowingRE extends 
>       * Specially treat only Object.toString method.
>       *
>       * @param proxy the proxy object
> -     * @param method the method being invoked
> +     * @param m the method being invoked
>       * @param args the arguments to the specified method
>       * @return the value returned by executing the specified method on
>       *         the specified proxy with the specified arguments, or null
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/IHandlerThrowingSE.java Mon Sep 20 22:30:33 2010
> @@ -54,7 +54,7 @@ public class IHandlerThrowingSE extends 
>       * Specially treat only Object.toString method.
>       *
>       * @param proxy the proxy object
> -     * @param method the method being invoked
> +     * @param m the method being invoked
>       * @param args the arguments to the specified method
>       * @return the value returned by executing the specified method on
>       *         the specified proxy with the specified arguments, or null
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/InvHandler.java Mon Sep 20 22:30:33 2010
> @@ -48,7 +48,7 @@ public class InvHandler implements Invoc
>       * Specially treat only Object.equals method.
>       *
>       * @param proxy the proxy object
> -     * @param method the method being invoked
> +     * @param m the method being invoked
>       * @param args the arguments to the specified method
>       * @return the value returned by executing the specified method on
>       *         the specified proxy with the specified arguments, or null
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/NonProxyObjectThrowingRE.java Mon Sep 20 22:30:33 2010
> @@ -33,8 +33,6 @@ public class NonProxyObjectThrowingRE ex
>  
>      /**
>       * Store given array of objects and creates TrustIterator.
> -     *
> -     * @param objs array of objects
>       */
>      public NonProxyObjectThrowingRE() {
>          super(new Object[] { new Object() });
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/ValidIHandler.java Mon Sep 20 22:30:33 2010
> @@ -57,7 +57,7 @@ public class ValidIHandler extends Valid
>       * Specially treat only Object.toString method.
>       *
>       * @param proxy the proxy object
> -     * @param method the method being invoked
> +     * @param m the method being invoked
>       * @param args the arguments to the specified method
>       * @return the value returned by executing the specified method on
>       *         the specified proxy with the specified arguments, or null
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/proxytrust/util/WrongMethodIHandler.java Mon Sep 20 22:30:33 2010
> @@ -54,7 +54,7 @@ public class WrongMethodIHandler extends
>       * Specially treat only Object.toString method.
>       *
>       * @param proxy the proxy object
> -     * @param method the method being invoked
> +     * @param m the method being invoked
>       * @param args the arguments to the specified method
>       * @return the value returned by executing the specified method on
>       *         the specified proxy with the specified arguments, or null
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/security/security/VerifyCodebaseIntegrityTest.java Mon Sep 20 22:30:33 2010
> @@ -326,7 +326,7 @@ public class VerifyCodebaseIntegrityTest
>       * classes whose 'providesIntegrity' methods are expected to be called.
>       *
>       * @param clNames array of classes for which evaluate the result
> -     * @param urls URLs string for which get expected results
> +     * @param str URLs string for which get expected results
>       * @throws MalformedURLException if any of the URLs are invalid
>       */
>      protected Class getExpRes(Class[] clNames, String str)
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java Mon Sep 20 22:30:33 2010
> @@ -602,9 +602,6 @@ abstract public class AbstractBaseTest e
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      abstract protected void applyTestDef() throws Exception;
>  
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java Mon Sep 20 22:30:33 2010
> @@ -72,9 +72,6 @@ public class DefaultDiscoverPublic exten
>       *  2. Retrieves the set of groups the lookup discovery manager is
>       *     configured to discover. 
>       *  3. Verifies the set of groups contains only the public group.
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          DiscoveryManagement dm = srvcDiscoveryMgr.getDiscoveryManager();
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java Mon Sep 20 22:30:33 2010
> @@ -97,9 +97,6 @@ public class AddListenerNPE extends Abst
>       *     a <code>NullPointerException</code> is not always thrown.
>       *  3. Attempts to add a <code>null</code> listener
>       *  4. Verifies that a <code>NullPointerException</code> is thrown.
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>  	logger.log(Level.FINE, "requesting a lookup cache");
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheDiscard.java Mon Sep 20 22:30:33 2010
> @@ -58,9 +58,6 @@ public class CacheDiscard extends CacheL
>       *  3. Discards the retrieved service.
>       *  4. Queries the cache again to verify that the service has indeed
>       *     been discarded as expected.
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Query the cache for the desired registered service. */
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookup.java Mon Sep 20 22:30:33 2010
> @@ -87,9 +87,6 @@ public class CacheLookup extends Abstrac
>       *     applying NO second-stage filtering (<code>null</code> filter 
>       *     parameter) - to query the cache for the desired expected service
>       *  3. Verifies that the service returned is the service expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Create a cache for the services that were registered. */
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterFilter.java Mon Sep 20 22:30:33 2010
> @@ -93,9 +93,6 @@ public class CacheLookupFilterFilter ext
>       *     of the template matching and the first-stage filtering - to query
>       *     the cache for the desired expected service
>       *  3. Verifies that the service returned is the service expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Create the cache and verify it returns a registered service. */ 
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/cache/CacheLookupFilterNoFilter.java Mon Sep 20 22:30:33 2010
> @@ -81,9 +81,6 @@ public class CacheLookupFilterNoFilter e
>       *     applying NO second-stage filtering (<code>null</code> filter 
>       *     parameter) - to query the cache for the desired expected service
>       *  3. Verifies that the service returned is the service expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Create the cache and verify it returns a registered service. */ 
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/event/ModifyAttrServiceChanged.java Mon Sep 20 22:30:33 2010
> @@ -109,9 +109,6 @@ public class ModifyAttrServiceChanged ex
>       *     or augmentation, and verifies that the expected number of 
>       *     serviceChanged/serviceRemoved/serviceAdded events are sent by
>       *     the cache's event mechanism.
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          registerAndVerify(waitDur);
> @@ -122,9 +119,6 @@ public class ModifyAttrServiceChanged ex
>      /** Verifies the number of added, removed, and changed events expected
>       *  to have been received by the listener are each equal to the expected
>       *  value at the time this method is called.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if conditions indicate success.
>       */
>      protected void verifyCurrentEvents() throws Exception {
>          verifyCurrentEvents(nAddedExpected,
> @@ -206,9 +200,6 @@ public class ModifyAttrServiceChanged ex
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if there was no problem.
>       */
>      protected void changeAttrAndVerify() throws Exception {
>          synchronized(regInfoMap) {
> @@ -306,9 +297,6 @@ public class ModifyAttrServiceChanged ex
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if there was no problem.
>       */
>      protected void createCacheAndVerify() throws Exception {
>          createCacheAndVerify(template);
> @@ -356,9 +344,6 @@ public class ModifyAttrServiceChanged ex
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if there was no problem.
>       */
>      protected void registerAndVerify(long waitDur) throws Exception {
>          if(nServices <= 0) throw new TestException
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/Lookup.java Mon Sep 20 22:30:33 2010
> @@ -74,9 +74,6 @@ public class Lookup extends AbstractBase
>       *     (<code>null</code> filter parameter) - to query the discovered
>       *     lookup services for the desired service. 
>       *  2. Verifies that the service returned is the service expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Through the service discovery manager, query the discovered lookup
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupFilter.java Mon Sep 20 22:30:33 2010
> @@ -90,9 +90,6 @@ public class LookupFilter extends Lookup
>       *     during setup - to query the discovered lookup services for the
>       *     desired service. 
>       *  2. Verifies that the service returned is the service expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* The version of lookup() being tested here returns 1 arbitrarily
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMax.java Mon Sep 20 22:30:33 2010
> @@ -67,9 +67,6 @@ public class LookupMax extends Lookup {
>       *     (<code>null</code> filter parameter) - to query the discovered
>       *     lookup services for the desired services. 
>       *  2. Verifies that the services returned are the services expected
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Through the service discovery manager, query the discovered lookup
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinEqualsMax.java Mon Sep 20 22:30:33 2010
> @@ -105,9 +105,6 @@ public class LookupMinEqualsMax extends 
>       *  2. Verifies that the services returned are the services expected,
>       *     and the <code>lookup</code> method blocks for the expected
>       *     amount of time
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Verify blocking mechanism for less than min registered services */
> @@ -140,9 +137,6 @@ public class LookupMinEqualsMax extends 
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if there was no problem.
>       */
>      protected void verifyBlocking(int startVal,int nSrvcs,long waitDur) 
>  	throws Exception
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupMinMaxNoBlock.java Mon Sep 20 22:30:33 2010
> @@ -79,9 +79,6 @@ public class LookupMinMaxNoBlock extends
>       *  2. Verifies that the services returned are the services expected,
>       *     and the <code>lookup</code> method returns immediately without
>       *     blocking
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Verify immediate return when more than minMatches services are
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWait.java Mon Sep 20 22:30:33 2010
> @@ -100,9 +100,6 @@ public class LookupWait extends Abstract
>       *     returned is the service expected, and the <code>lookup</code>
>       *     method blocks until the registration of the desired service 
>       *     has completed successfully
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Verify blocking mechanism in the absense of registered services */
> @@ -133,9 +130,6 @@ public class LookupWait extends Abstract
>       *  If the <code>String</code> returned by this method is 
>       *  non-<code>null</code>, then the test should declare failure and
>       *  display the value returned by this method.
> -     *
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if there was no problem.
>       */
>      protected void verifyBlocking(int nSrvcs,int nAttrs,long waitDur) 
>  	throws Exception
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitFilter.java Mon Sep 20 22:30:33 2010
> @@ -86,9 +86,6 @@ public class LookupWaitFilter extends Lo
>       *     rejects the services that would normally be discovered if the
>       *     filter were not applied, the call to the <code>lookup</code>
>       *     method blocks for the full amount of time requested
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          /* Verify blocking mechanism in the absense of registered services */
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/servicediscovery/lookup/LookupWaitNoBlock.java Mon Sep 20 22:30:33 2010
> @@ -86,9 +86,6 @@ public class LookupWaitNoBlock extends L
>       *  2. Verifies that the service returned is the service expected,
>       *     and the <code>lookup</code> method returns immediately without
>       *     blocking
> -     * 
> -     *  @return a <code>String</code> containing a failure message, or
> -     *           <code>null</code> if the test was successful.
>       */
>      protected void applyTestDef() throws Exception {
>          long waitDur = 30*1000;
>
> Modified: incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java
> URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java?rev=999149&r1=999148&r2=999149&view=diff
> ==============================================================================
> --- incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java (original)
> +++ incubator/river/jtsk/trunk/qa/src/com/sun/jini/test/spec/url/httpmd/handler/Equals.java Mon Sep 20 22:30:33 2010
> @@ -22,6 +22,8 @@ import java.util.logging.Level;
>  
>  // java.net
>  import java.net.URL;
> +import java.net.URLStreamHandler;
> +import net.jini.url.httpmd.Handler;
>  
>  
>  /**
> @@ -30,7 +32,7 @@ import java.net.URL;
>   * Purpose:
>   *   This test verifies the behavior of {@link URL#equals(Object)} method
>   *   for HTTPMD URL objects.
> - *   {@link Handler#sameFile(URL,URL)} method is
> + *   {@link Handler#sameFile(java.net.URL, java.net.URL)} method is
>   *   used to see if these HTTPMD URL objects refer to
>   *   the same file using the following rules:
>   *     - case-insensitive comparison of the protocols and of the
> @@ -44,7 +46,7 @@ import java.net.URL;
>   *   {@link URL#equals(Object)} method. {@link URL#equals(Object)} method
>   *   invokes {@link Handler#equals(URL,URL)} method inherited
>   *   from {@link URLStreamHandler} class.
> - *   {@link URLStreamHandler#equals(URL,URL)} method uses
> + *   {@link URLStreamHandler#equals(java.net.URL, java.net.URL)} method uses
>   *   {@link Handler#sameFile(URL,URL)} method to compare
>   *   HTTPMD URL objects.
>   *   The cases:
>
>
>
>