Author: peter_firmstone Date: Sat Dec 26 09:03:30 2015 New Revision: 1721715
URL: http://svn.apache.org/viewvc?rev=1721715&view=rev Log: Prep for release: Update javadoc and reduce log messages for services not implementing Startable to FINE. Removed: river/jtsk/trunk/src/org/apache/river/api/io/ Modified: river/jtsk/trunk/src-doc/static/release-notes/index.html river/jtsk/trunk/src/net/jini/core/entry/CloneableEntry.java river/jtsk/trunk/src/net/jini/entry/AbstractEntry.java river/jtsk/trunk/src/net/jini/lookup/entry/UIDescriptor.java river/jtsk/trunk/src/org/apache/river/start/ActivateWrapper.java river/jtsk/trunk/src/org/apache/river/start/NonActivatableServiceDescriptor.java Modified: river/jtsk/trunk/src-doc/static/release-notes/index.html URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src-doc/static/release-notes/index.html?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src-doc/static/release-notes/index.html (original) +++ river/jtsk/trunk/src-doc/static/release-notes/index.html Sat Dec 26 09:03:30 2015 @@ -138,10 +138,11 @@ following namespaces (including all subp </ul> plus the following classes: <ul> -<li><a href="../api/net/jini/discovery/ConstrainableLookupLocatorTrustVerifier.html"><code>ConstrainableLookupLocatorTrustVerifier</code></a> -<li><a href="../api/org/apache/river/config/KeyStores.html"><code>KeyStores</code></a> -<li><a href="../api/org/apache/river/config/ConfigUtil.html"><code>ConfigUtil</code></a> -<li><a href="../api/org/apache/river/logging/LogManager.html"><code>LogManager</code></a> +<li><a href="../api/net/jini/discovery/ConstrainableLookupLocatorTrustVerifier.html"><code>net.jini.discovery.ConstrainableLookupLocatorTrustVerifier</code></a> +<li><a href="../api/net/jini/discovery/ConstrainableLookupLocator.html"><code>net.jini.discovery.ConstrainableLookupLocator</code></a> +<li><a href="../api/org/apache/river/config/KeyStores.html"><code>org.apache.river.config.KeyStores</code></a> +<li><a href="../api/org/apache/river/config/ConfigUtil.html"><code>org.apache.river.config.ConfigUtil</code></a> +<li><a href="../api/org/apache/river/logging/LogManager.html"><code>org.apache.river.LogManager</code></a> </ul> Any other classes or interfaces found in this JAR file should be considered implementation details. Modified: river/jtsk/trunk/src/net/jini/core/entry/CloneableEntry.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/net/jini/core/entry/CloneableEntry.java?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src/net/jini/core/entry/CloneableEntry.java (original) +++ river/jtsk/trunk/src/net/jini/core/entry/CloneableEntry.java Sat Dec 26 09:03:30 2015 @@ -19,11 +19,25 @@ package net.jini.core.entry; /** - * Required because Cloneable is only a marker interface. - * @author peter + * Required by service utilities to avoid sharing internal state. All cloned + * instances should be deep copies. + * + * @since 3.0.0 */ public interface CloneableEntry extends Entry, Cloneable { + /** + * Clone has been implemented in AbstractEntry to allow utilities such as + * {@link net.jini.lookup.ServiceDiscoveryManager} to avoid sharing + * internally stored mutable Entry instances with client code. + * + * Entry's that have mutable fields, for example arrays or collections, + * should override this method, call super.clone(), then safely copy + * any mutable fields before returning the Entry clone. + * + * @return a clone of the original Entry + * @since 3.0.0 + */ public Entry clone(); } Modified: river/jtsk/trunk/src/net/jini/entry/AbstractEntry.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/net/jini/entry/AbstractEntry.java?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src/net/jini/entry/AbstractEntry.java (original) +++ river/jtsk/trunk/src/net/jini/entry/AbstractEntry.java Sat Dec 26 09:03:30 2015 @@ -51,7 +51,12 @@ public abstract class AbstractEntry impl * {@link net.jini.lookup.ServiceDiscoveryManager} to avoid sharing * internally stored instances with client code. * + * Entry's that have mutable fields, for example arrays or collections, + * should override this method, call super.clone(), then safely copy + * any mutable fields before returning. + * * @return a clone of the original Entry + * @since 3.0.0 */ public Entry clone() { Modified: river/jtsk/trunk/src/net/jini/lookup/entry/UIDescriptor.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/net/jini/lookup/entry/UIDescriptor.java?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src/net/jini/lookup/entry/UIDescriptor.java (original) +++ river/jtsk/trunk/src/net/jini/lookup/entry/UIDescriptor.java Sat Dec 26 09:03:30 2015 @@ -76,7 +76,7 @@ public class UIDescriptor extends Abstra public String toolkit; /** - * A set of objects that describe the UI generated by the marshalled UI factory. + * An unmodifiable set of objects that describe the UI generated by the marshalled UI factory. */ public Set attributes; Modified: river/jtsk/trunk/src/org/apache/river/start/ActivateWrapper.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/start/ActivateWrapper.java?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src/org/apache/river/start/ActivateWrapper.java (original) +++ river/jtsk/trunk/src/org/apache/river/start/ActivateWrapper.java Sat Dec 26 09:03:30 2015 @@ -485,7 +485,7 @@ public class ActivateWrapper implements if (impl instanceof Startable) { ((Startable) impl).start(); } else { - logger.log( Level.SEVERE, + logger.log( Level.FINE, "Service {0} doesn''t implement {1} {2} {3} {4} {5} {6}", new Object [] { Modified: river/jtsk/trunk/src/org/apache/river/start/NonActivatableServiceDescriptor.java URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/start/NonActivatableServiceDescriptor.java?rev=1721715&r1=1721714&r2=1721715&view=diff ============================================================================== --- river/jtsk/trunk/src/org/apache/river/start/NonActivatableServiceDescriptor.java (original) +++ river/jtsk/trunk/src/org/apache/river/start/NonActivatableServiceDescriptor.java Sat Dec 26 09:03:30 2015 @@ -682,7 +682,7 @@ public class NonActivatableServiceDescri if (impl instanceof Startable) { ((Startable) impl).start(); } else { - logger.log( Level.SEVERE, + logger.log( Level.FINE, "Service {0} doesn''t implement {1} {2} {3} {4} {5} {6}", new Object [] {
