You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2013/11/17 09:38:50 UTC
svn commit: r1542661 [2/3] - in /river/jtsk/skunk/qa_refactor/trunk: ./
qa/src/com/sun/jini/test/impl/fiddler/joinadmin/
qa/src/com/sun/jini/test/share/
qa/src/com/sun/jini/test/spec/lookupservice/test_set00/
qa/src/com/sun/jini/test/spec/lookupservice...
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/index.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/index.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/index.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/index.html Sun Nov 17 08:38:47 2013
@@ -17,14 +17,14 @@
!-->
<html lang="en-US">
<head>
-<title>Apache River Release Notes, v2.2.0</title>
+<title>Apache River Release Notes, v3.0.0</title>
</head>
<body text="#000000" bgcolor="#ffffff" link="#9b37cc"
vlink="#cc1877" alink="#ffffff">
<center> <h1><a name="TOP">Apache River
-<br>v2.2.0 Release Notes</a></h1></center>
+<br>v3.0.0 Release Notes</a></h1></center>
<p>
Apache River is aimed at the development and advancement of the
River technology core infrastructure. It is a top level Apache project. River technology is a service
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jeri.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jeri.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jeri.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jeri.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1><code>net.jini.jeri</code><br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jinisurrogatearchitecture.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jinisurrogatearchitecture.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jinisurrogatearchitecture.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/jinisurrogatearchitecture.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Jini Surrogate Architecture<br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/join.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/join.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/join.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/join.html Sun Nov 17 08:38:47 2013
@@ -24,7 +24,7 @@
<title>Jini Join Utilities Release Notes</title>
<center><h1>Jini Join Utilities
- <BR>Apache River v2.2.0 Release Notes
+ <BR>Apache River v3.0.0 Release Notes
</h1></center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/lease.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/lease.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/lease.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/lease.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Jini<font size="-1"><sup>TM</sup></font> Lease Utilities<BR>
-River v2.2.0 Release Notes</h1>
+River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/loader.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/loader.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/loader.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/loader.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1><code>net.jini.loader</code><br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mahalo.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mahalo.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mahalo.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mahalo.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Mahalo<br>
-v2.2.0 Release Notes</h1>
+v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mercury.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mercury.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mercury.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/mercury.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Mercury<br>
-v2.2.0 Release Notes</h1>
+v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/netjinientry.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/netjinientry.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/netjinientry.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/netjinientry.html Sun Nov 17 08:38:47 2013
@@ -26,7 +26,7 @@
<body text="black" bgcolor="white" link="#9b37cc" vlink="#cc1877" alink="white">
<center>
<h1><code>net.jini.entry</code> package<br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<hr>
<ul>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/new.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/new.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/new.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/new.html Sun Nov 17 08:38:47 2013
@@ -18,13 +18,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html lang="en-US">
<head>
- <title>Apache River Release Notes, v2.2.0</title>
+ <title>Apache River Release Notes, v3.0.0</title>
</head>
<body alink="#ffffff" vlink="#cc1877" link="#9b37cc"
style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);">
<h1>
<center> <a name="TOP">Apache River <br>
-</a><a href="index.html">v2.2.0 Release Notes</a></center>
+</a><a href="index.html">v3.0.0 Release Notes</a></center>
</h1>
<p>
</p>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/norm.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/norm.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/norm.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/norm.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Norm<br>
-v2.2.0 Release Notes</h1>
+v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/outrigger.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/outrigger.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/outrigger.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/outrigger.html Sun Nov 17 08:38:47 2013
@@ -26,7 +26,7 @@
<body text="black" bgcolor="white" link="#9b37cc" vlink="#cc1877" alink="white">
<center>
<h1>Outrigger<br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<hr>
<ul>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/reggie.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/reggie.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/reggie.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/reggie.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Reggie<br>
-v2.2.0 Release Notes</h1>
+v3.0.0 Release Notes</h1>
</center>
<hr>
<ul>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/security.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/security.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/security.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/security.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1><code>net.jini.security</code><br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicediscovery.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicediscovery.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicediscovery.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicediscovery.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1>Jini Service Discovery Utilities
- <BR>River v2.2.0 Release Notes
+ <BR>River v3.0.0 Release Notes
</h1>
</center>
<HR>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicestarter.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicestarter.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicestarter.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/release-notes/servicestarter.html Sun Nov 17 08:38:47 2013
@@ -25,7 +25,7 @@
<center>
<h1><code>com.sun.jini.start</code><br>
-Apache River v2.2.0 Release Notes</h1>
+Apache River v3.0.0 Release Notes</h1>
</center>
<HR>
<UL>
Modified: river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src-doc/static/spec-index.html Sun Nov 17 08:38:47 2013
@@ -33,7 +33,7 @@ The community must vote on changes to sp
The trademark for Jini has expired.
-->
-<h1><center>Jini Network Technology Specifications<br>v2.2.1</center></h1>
+<h1><center>Jini Network Technology Specifications<br>v3.0.0</center></h1>
<UL>
<p>
The existing specifications were accepted as standards of the Jini Community(SM)
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/constants/VersionConstants.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/constants/VersionConstants.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/constants/VersionConstants.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/constants/VersionConstants.java Sun Nov 17 08:38:47 2013
@@ -25,5 +25,5 @@ package com.sun.jini.constants;
*/
public interface VersionConstants {
/** Current version of the Apache River release */
- String SERVER_VERSION = "2.3.0";
+ String SERVER_VERSION = "3.0.0";
}
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryHandle.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryHandle.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryHandle.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/EntryHandle.java Sun Nov 17 08:38:47 2013
@@ -173,7 +173,6 @@ class EntryHandle extends BaseHandle imp
*
* @see #hashFor(EntryRep,int)
* @see #descFor(EntryRep,int)
- * @see EntryHandleHashDesc
* @return long[4] containing the hash, bitsPerField, fieldsInHash and mask
* in that order.
*/
@@ -243,7 +242,7 @@ class EntryHandle extends BaseHandle imp
* as part of the overall hash for the entry. The last 32 bytes of
* the field value are used (or fewer if there are fewer).
*
- * @see #hashFor(EntryRep,int,EntryHandleHashDesc)
+ * @see #hashFor(EntryRep,int)
*/
static long hashForField(EntryRep rep, int field) {
MarshalledInstance v = rep.value(field);
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableObject.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableObject.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableObject.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/StorableObject.java Sun Nov 17 08:38:47 2013
@@ -44,7 +44,7 @@ public interface StorableObject<T> {
/**
* Restore the persistent fields and return new instance.
* @param in
- * @return
+ * @return new object instance.
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/snaplogstore/BaseObject.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/snaplogstore/BaseObject.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/snaplogstore/BaseObject.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/outrigger/snaplogstore/BaseObject.java Sun Nov 17 08:38:47 2013
@@ -38,7 +38,7 @@ class BaseObject<T extends StorableObjec
static final long serialVersionUID = -400804064969360164L;
/**
- * @serialField
+ * @serialField containing a binary blob.
*/
private final byte[] blob;
@@ -65,15 +65,15 @@ class BaseObject<T extends StorableObjec
/**
* Added to enable the serial form to be modified
- * in a backward compatible manner (if necessary) with 2.3.0 and later.
+ * in a backward compatible manner (if necessary) with 3.0.0 and later.
* Modified serial form would be a breaking change for versions
- * prior to 2.3.0
+ * prior to 3.0.0
*
* @serialData
* @param ois
* @throws IOException
* @throws ClassNotFoundException
- * @since 2.3.0
+ * @since 3.0.0
*/
private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException {
ois.defaultReadObject();
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/phoenix/ActivationGroupImpl.java Sun Nov 17 08:38:47 2013
@@ -21,8 +21,18 @@ package com.sun.jini.phoenix;
import java.rmi.MarshalledObject;
import java.rmi.RemoteException;
import java.rmi.activation.ActivationException;
+import java.rmi.activation.ActivationGroup;
import java.rmi.activation.ActivationGroupDesc;
import java.rmi.activation.ActivationGroupID;
+import java.rmi.activation.ActivationMonitor;
+import java.rmi.activation.ActivationSystem;
+import java.rmi.server.UnicastRemoteObject;
+import javax.security.auth.Subject;
+import javax.security.auth.login.LoginContext;
+import net.jini.config.Configuration;
+import net.jini.export.Exporter;
+import net.jini.export.ProxyAccessor;
+import net.jini.security.ProxyPreparer;
/**
* The default activation group implementation for phoenix. Instances of
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarEvent.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarEvent.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarEvent.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/reggie/RegistrarEvent.java Sun Nov 17 08:38:47 2013
@@ -60,7 +60,7 @@ class RegistrarEvent extends ServiceEven
* @param handback the client handback
* @param serviceID the serviceID of the serviceItem that triggered the event
* @param transition the transition that triggered the event
- * @param serviceItem the new state of the serviceItem, or null if deleted
+ * @param item the new state of the serviceItem, or null if deleted
*/
public RegistrarEvent(Object source,
long eventID,
Modified: river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/ClassServer.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/ClassServer.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/ClassServer.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/com/sun/jini/tool/ClassServer.java Sun Nov 17 08:38:47 2013
@@ -19,7 +19,6 @@ package com.sun.jini.tool;
import com.sun.jini.logging.Levels;
import com.sun.jini.start.LifeCycle;
-import org.apache.river.api.util.Commission;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -50,6 +49,7 @@ import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.river.api.util.Commission;
/**
* A simple HTTP server, for serving up JAR and class files.
@@ -115,7 +115,7 @@ import java.util.logging.Logger;
* This server can be run directly from the
* {@linkplain #main command line}
* or as a nonactivatable service under the
- * {@linkplain com.sun.jini.start Service Starter}.
+ * {@linkplain com.sun.jini.start.ServiceStarter}.
* <p>
* An example of running directly from the command line is:
* <blockquote><pre>
@@ -339,7 +339,7 @@ public class ClassServer extends Thread
* option.
*
* If constructed by {@link com.sun.jini.start.ServiceStarter},
- * {@link Starter#start() }, is called automatically, otherwise {@link #start()}
+ * {@link Commission#start() }, is called automatically, otherwise {@link #start()}
* must be called manually after construction.
*
* @param args command line options
@@ -349,7 +349,7 @@ public class ClassServer extends Thread
* understood
* @throws NullPointerException if <code>args</code> or any element
* of <code>args</code> is <code>null</code>
- * @see Starter
+ * @see Commission
*/
public ClassServer(String[] args, LifeCycle lifeCycle) throws IOException {
this(new Initializer(lifeCycle, args));
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/EventRegistration.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/EventRegistration.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/EventRegistration.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/EventRegistration.java Sun Nov 17 08:38:47 2013
@@ -77,7 +77,7 @@ public class EventRegistration implement
/**
* Constructs an <tt>EventRegistration</tt> object.
*
- * Immutable since 2.3.0
+ * Immutable since 3.0.0
*
* @param eventID a <tt>long</tt> representing the event identifier
* @param source an <tt>Object</tt> representing the event source
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/RemoteEvent.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/RemoteEvent.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/RemoteEvent.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/core/event/RemoteEvent.java Sun Nov 17 08:38:47 2013
@@ -72,7 +72,7 @@ import java.rmi.MarshalledObject;
* RemoteEvent object being sent occurs outside of the scope of the
* transaction (but is visible within the transaction).
*
- * Immutable since 2.3.0
+ * Immutable since 3.0.0
*
* @author Sun Microsystems, Inc.
*
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupDiscoveryManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupDiscoveryManager.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupDiscoveryManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupDiscoveryManager.java Sun Nov 17 08:38:47 2013
@@ -784,68 +784,18 @@ abstract class AbstractLookupDiscoveryMa
}//end class GroupDiscoveryListener
/**
- * Constructs an instance of this class, using the given
- * <code>Configuration</code>, that will organize and manage all
- * discovery-related activities on behalf of the client or service
- * that instantiates this class.
- * <p>
- * If <code>null</code> (<code>DiscoveryGroupManagement.ALL_GROUPS</code>)
- * is input to the <code>groups</code> parameter, then attempts will be
- * made via group discovery to discover all lookup services located within
- * range of the entity that constructs this class. If the empty array
- * (<code>DiscoveryGroupManagement.NO_GROUPS</code>) is input to that
- * parameter, no group discovery will be performed until the set of
- * groups to discover is populated.
- * <p>
- * If an empty array or a <code>null</code> reference is input to the
- * <code>locators</code> parameter, no locator discovery will be performed
- * until the set of locators to discover is populated.
- *
- * @param groups <code>String</code> array, none of whose elements may
- * be <code>null</code>, consisting of the names of the
- * groups whose members are lookup services the client
- * or service wishes to discover.
- * @param locators array of instances of <code>LookupLocator</code>, none
- * of whose elements may be <code>null</code>, and in
- * which each element corresponds to a specific lookup
- * service the client or service wishes to discover via
- * locator discovery.
- * @param listener a reference to <code>DiscoveryListener</code> object
- * that will be notified when a targeted lookup service
- * is discovered or discarded.
- *
- * @param config an instance of <code>Configuration</code>, used to
- * obtain the objects needed to configure the current
- * instance of this class
- *
- * @throws java.io.IOException because construction of this class may
- * initiate the discovery process, which can throw an
- * <code>IOException</code> when socket allocation occurs.
- *
- * @throws net.jini.config.ConfigurationException indicates an exception
- * occurred while retrieving an item from the given
- * <code>Configuration</code>
- *
- * @throws java.lang.NullPointerException this exception occurs when
- * either one or more of the elements of the <code>groups</code>
- * parameter is <code>null</code>, or one or more elements of
- * the <code>locators</code> parameter is <code>null</code>, or
- * when <code>null</code> is input for the configuration.
- *
- * @see net.jini.core.discovery.LookupLocator
- * @see net.jini.discovery.DiscoveryListener
- * @see net.jini.config.Configuration
+ * Constructs an instance of this class
*/
AbstractLookupDiscoveryManager( DiscoveryListener listener,
LookupDiscovery lookup,
LookupLocatorDiscovery locator)
{
- /* Initiate the discovery process */
- if(listener != null) listeners.add(listener);
- /* Configure for group discovery */
- lookupDisc = lookup;
- /* Configure for locator discovery */
- locatorDisc = locator;
+ /* Prepare the discovery process */
+ if(listener != null) listeners.add(listener);
+ /* Configure for group discovery */
+ lookupDisc = lookup;
+ /* Configure for locator discovery */
+ locatorDisc = locator;
}//end constructor
/**
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupLocatorDiscovery.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupLocatorDiscovery.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupLocatorDiscovery.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/discovery/AbstractLookupLocatorDiscovery.java Sun Nov 17 08:38:47 2013
@@ -542,31 +542,20 @@ abstract class AbstractLookupLocatorDisc
}//end class DiscoveryTask
/**
- * Creates an instance of this class (<code>LookupLocatorDiscovery</code>),
- * with an initial array of <code>LookupLocator</code>s to be managed.
- * For each managed <code>LookupLocator</code>, unicast discovery is
- * performed to obtain a <code>ServiceRegistrar</code> proxy for that
- * lookup service.
- *
- * @param locators the locators to discover
- *
- * @throws java.lang.NullPointerException input array contains at least
- * one <code>null</code> element
+ * Creates an instance of this class
*/
- public AbstractLookupLocatorDiscovery() {
+ AbstractLookupLocatorDiscovery() {
this(initEmptyConfig());
}//end constructor
/**
- * Constructs a new lookup locator discovery object, set to discover the
- * given set of locators, and having the given <code>Configuration</code>.
+ * Constructs a new lookup locator discovery object, having the given
+ * <code>Configuration</code>.
* <p>
* For each managed <code>LookupLocator</code>, unicast discovery is
* performed to obtain a <code>ServiceRegistrar</code> proxy for that
* lookup service.
*
- * @param locators the locators to discover
- *
* @param config an instance of <code>Configuration</code>, used to
* obtain the objects needed to configure the current
* instance of this class
@@ -575,11 +564,10 @@ abstract class AbstractLookupLocatorDisc
* occurred while retrieving an item from the given
* <code>Configuration</code>
*
- * @throws java.lang.NullPointerException input array contains at least
- * one <code>null</code> element or <code>null</code> is input
+ * @throws java.lang.NullPointerException <code>null</code> is input
* for the configuration
*/
- public AbstractLookupLocatorDiscovery(Configuration config)
+ AbstractLookupLocatorDiscovery(Configuration config)
throws ConfigurationException
{
this(init(config));
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassLoader.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/loader/pref/PreferredClassLoader.java Sun Nov 17 08:38:47 2013
@@ -1061,7 +1061,7 @@ public class PreferredClassLoader extend
*
* @throws an IOException if isPreferredResource throws an IOException.
*
- * @since 2.3.0
+ * @since 3.0.0
**/
public Enumeration<URL> getResources(String name) throws IOException{
return (isPreferredResource(name, false) ?
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/JoinManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/JoinManager.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/JoinManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/JoinManager.java Sun Nov 17 08:38:47 2013
@@ -2522,7 +2522,7 @@ public class JoinManager {
* @param leaseMgr
* @param discoveryMgr
* @param serviceProxy
- * @return
+ * @return Conf
* @throws IOException
* @throws NullPointerException
* @throws IllegalArgumentException
@@ -2549,7 +2549,7 @@ public class JoinManager {
* @param leaseMgr
* @param discoveryMgr
* @param serviceProxy
- * @return
+ * @return Conf
* @throws IOException
* @throws ConfigurationException
* @throws NullPointerException
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/Security.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/Security.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/Security.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/Security.java Sun Nov 17 08:38:47 2013
@@ -577,7 +577,7 @@ public final class Security {
* @param action The code to be run as the Subject.
* @return The value returned by the PrivilegedAction's run() method.
* @throws NullPointerException if action is null;
- *
+ * @since 3.0.0
*/
public static <T> T doAs(final Subject subject,
final PrivilegedAction<T> action) {
@@ -613,7 +613,7 @@ public final class Security {
* is package private and can only be accessed through SubjectDomainCombiner
* public methods.
* <p>
- * If a policy provider is installed that recognises SubjectDomain, then
+ * If a policy provider is installed that recognizes SubjectDomain, then
* Subjects who's principals are mutated are effective immediately.
* <p>
* No AuthPermission is required to call this method.
@@ -623,6 +623,7 @@ public final class Security {
* @return The value returned by the PrivilegedAction's run() method.
* @throws NullPointerException if action is null;
* @throws PrivilegedActionException
+ * @since 3.0.0
*/
public static <T> T doAs(final Subject subject,
final PrivilegedExceptionAction<T> action)
@@ -1191,6 +1192,7 @@ public final class Security {
* Extends and overrides SubjectDomainCombiner, to allow untrusted code
* to run as a Subject, without injecting Principals into the ProtectionDomain
* of untrusted code.
+ * @since 3.0.0
*/
private static class DistributedSubjectCombiner extends SubjectDomainCombiner {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/net/jini/security/policy/DynamicPolicyProvider.java Sun Nov 17 08:38:47 2013
@@ -162,9 +162,7 @@ public class DynamicPolicyProvider exten
private final Policy basePolicy; // refresh protected by transactionWriteLock
// DynamicPolicy grant's for Proxy's.
private final Collection<PermissionGrant> dynamicPolicyGrants;
- private final boolean basePolicyIsDynamic; // Don't use cache if true.
- private final boolean revokeable;
- private final boolean basePolicyIsRemote;
+ private final boolean revocable;
private final boolean loggable;
// do something about some domain permissions for this domain so we can
@@ -223,19 +221,15 @@ public class DynamicPolicyProvider exten
dynamicPolicyGrants = Collections.newSetFromMap(new ConcurrentHashMap<PermissionGrant,Boolean>(64));
loggable = logger.isLoggable(Level.FINEST);
if (basePolicy instanceof DynamicPolicy) {
- DynamicPolicy dp = (DynamicPolicy) basePolicy;
- basePolicyIsDynamic = dp.grantSupported();
if (basePolicy instanceof RevocablePolicy ) {
RevocablePolicy rp = (RevocablePolicy) basePolicy;
- revokeable = rp.revokeSupported();
+ revocable = rp.revokeSupported();
} else {
- revokeable = false;
+ revocable = false;
}
} else {
- basePolicyIsDynamic = false;
- revokeable = revoke.equals(tRue);
+ revocable = revoke.equals(tRue);
}
- basePolicyIsRemote = basePolicy instanceof RemotePolicy ?true: false;
policyPermissions = basePolicy.getPermissions(policyDomain);
policyPermissions.setReadOnly();
}
@@ -255,19 +249,15 @@ public class DynamicPolicyProvider exten
dynamicPolicyGrants = Collections.newSetFromMap(new ConcurrentHashMap<PermissionGrant,Boolean>(64));
loggable = logger.isLoggable(Level.FINEST);
if (basePolicy instanceof DynamicPolicy) {
- DynamicPolicy dp = (DynamicPolicy) basePolicy;
- basePolicyIsDynamic = dp.grantSupported();
if (basePolicy instanceof RevocablePolicy ) {
RevocablePolicy rp = (RevocablePolicy) basePolicy;
- revokeable = rp.revokeSupported();
+ revocable = rp.revokeSupported();
} else {
- revokeable = false;
+ revocable = false;
}
} else {
- basePolicyIsDynamic = false;
- revokeable = true;
+ revocable = true;
}
- basePolicyIsRemote = basePolicy instanceof RemotePolicy ?true: false;
policyPermissions = basePolicy.getPermissions(policyDomain);
policyPermissions.setReadOnly();
}
@@ -328,7 +318,7 @@ Put the policy providers and all referen
// private void ensureDependenciesResolved()
public boolean revokeSupported() {
- return revokeable;
+ return revocable;
}
@Override
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/common/Beta.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/common/Beta.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/common/Beta.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/common/Beta.java Sun Nov 17 08:38:47 2013
@@ -26,6 +26,7 @@ import java.lang.annotation.Target;
/**
* Annotation to indicate the annotated element is subject to change
* in behaviour, definition, removal.
+ * @since 3.0.0
*/
@Retention(RetentionPolicy.SOURCE)
@Target({
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributePermission.java Sun Nov 17 08:38:47 2013
@@ -26,6 +26,7 @@ import java.security.BasicPermission;
* @author peter
* @see SerialReflectionFactory
* @see ObjectOutput
+ * @since 3.0.0
*/
public class DistributePermission extends BasicPermission{
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/Distributed.java Sun Nov 17 08:38:47 2013
@@ -94,6 +94,7 @@ package org.apache.river.api.io;
* converted to {@link net.jini.io.MarshalledInstance} before un-marshaling.
* <p>
* @author Peter Firmstone.
+ * @since 3.0.0
*/
public interface Distributed {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectInputStream.java Sun Nov 17 08:38:47 2013
@@ -23,8 +23,11 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
/**
- *
- * @author
+ * DistributedObjectInputStream, an extension to Java serialization that allows
+ * for immutable and safely constructed objects
+ *
+ * @author Peter.
+ * @since 3.0.0
*/
public class DistributedObjectInputStream extends ObjectInputStream {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/DistributedObjectOutputStream.java Sun Nov 17 08:38:47 2013
@@ -23,8 +23,12 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
/**
- *
+ * DistributedObjectOutputStream replaces @ref{Distributed} instances
+ * in the OutputStream with a SerialReflectionFactory that recreates the
+ * Distributed Object during unmarshalling.
+ *
* @author peter
+ * @since 3.0.0
*/
public class DistributedObjectOutputStream extends ObjectOutputStream {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/SerialReflectionFactory.java Sun Nov 17 08:38:47 2013
@@ -55,6 +55,7 @@ import java.util.logging.Logger;
* @see DistributePermission
* @see Serializable
* @see Externalizable
+ * @since 3.0.0
*/
public final class SerialReflectionFactory implements Externalizable {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/package.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/package.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/package.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/io/package.html Sun Nov 17 08:38:47 2013
@@ -39,7 +39,7 @@ method or <code>Serializable</code> obje
<p>The classes {@link net.jini.io.MarshalOutputStream} and {@link
net.jini.io.MarshalInputStream} extend the Distributed object serialization stream
classes {@link org.apache.river.api.io.DistributedObjectOutputStream} and {@link
-org.apache.river.api.io.DistributeObjectInputStream} that implement replacement of
+org.apache.river.api.io.DistributedObjectInputStream} that implement replacement of
{@link org.apache.river.api.io.Distributed} objects with
{@link org.apache.river.api.io.SerialReflectionFactory} during marshalling and
substitution of <code>SerialReflectionFactory</code> with an object created by
@@ -56,8 +56,8 @@ instructions for creating an Object usin
{@link java.io.Externalizable#writeExternal} method of
<code>SerialReflectionFactory</code>, preventing unauthorised marshalling.
-@since 2.2.1
-@version 2.2.1
+@since 3.0.0
+@version 3.0.0
</body>
</html>
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/DefaultEntries.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/DefaultEntries.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/DefaultEntries.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/DefaultEntries.java Sun Nov 17 08:38:47 2013
@@ -38,7 +38,7 @@ import net.jini.lookup.entry.UIDescripto
*
* Suggested by Dan Creswell.
* @author Peter Firmstone.
- * @since 2.2.1
+ * @since 3.0.0
*/
public class DefaultEntries {
private final Set<Class> entrys;
@@ -57,7 +57,7 @@ public class DefaultEntries {
}
/**
* All all the Jini Platform Entry's
- * @return
+ * @return DefaultEntries
*/
public DefaultEntries addPlatformEntries(){
add(Comment.class);
@@ -78,7 +78,7 @@ public class DefaultEntries {
/**
* Generate a new array containing all Entry's added since last reset.
- * @return
+ * @return Class[] an array of Entry classes.
*/
public Class[] getEntries(){
return entrys.toArray(new Class[entrys.size()]);
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceItemClasspathSub.java Sun Nov 17 08:38:47 2013
@@ -54,7 +54,7 @@ import net.jini.core.lookup.ServiceItem;
* by calling #getServiceItem().
* </p>
* @author Peter Firmstone.
- * @since 2.2.1
+ * @since 3.0.0
*/
public abstract class ServiceItemClasspathSub extends ServiceItem{
private static final long SerialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamFilter.java Sun Nov 17 08:38:47 2013
@@ -39,7 +39,7 @@ import net.jini.lookup.ServiceItemFilter
* New instances can be created as required.
* <p>
* @author Peter Firmstone.
- * @since 2.2.1
+ * @since 3.0.0
*/
public class ServiceResultStreamFilter implements ResultStream<ServiceItem> {
private final List<ServiceItemFilter> filters;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/ServiceResultStreamUnmarshaller.java Sun Nov 17 08:38:47 2013
@@ -19,20 +19,18 @@
package org.apache.river.api.lookup;
import java.io.IOException;
-import java.security.CodeSource;
-import org.apache.river.api.lookup.ServiceItemClasspathSub;
-import org.apache.river.api.util.ResultStream;
import net.jini.core.lookup.*;
+import org.apache.river.api.util.ResultStream;
/**
* Add this to the ResultStream filter chain
- * {@link StreamServiceRegistrar#lookup(ServiceTemplate, Class[], int)}
+ * {@link StreamServiceRegistrar#lookup(ServiceTemplate, Class[], int, int)}
* to getServiceItem any ServiceItemClasspathSub's in the stream, prior to
* proxy verification, or applying constraints.
*
* @author Peter Firmstone.
- * @since 2.1.1
- * @see ServiceItemClasspathSub.
+ * @since 3.0.0
+ * @see ServiceItemClasspathSub
* @see StreamServiceRegistrar
*/
public class ServiceResultStreamUnmarshaller implements ResultStream<ServiceItem> {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/StreamServiceRegistrar.java Sun Nov 17 08:38:47 2013
@@ -18,9 +18,10 @@
package org.apache.river.api.lookup;
import java.io.IOException;
+import net.jini.core.lookup.ServiceItem;
import net.jini.core.lookup.ServiceRegistrar;
+import net.jini.core.lookup.ServiceRegistration;
import net.jini.core.lookup.ServiceTemplate;
-import net.jini.core.lookup.ServiceItem;
import org.apache.river.api.util.ResultStream;
/**
@@ -45,7 +46,7 @@ import org.apache.river.api.util.ResultS
* @see ServiceRegistrar
* @see ServiceRegistration
* @author Peter Firmstone
- * @since 2.2.1
+ * @since 3.0.0
*/
public interface StreamServiceRegistrar extends ServiceRegistrar{
@@ -72,11 +73,11 @@ public interface StreamServiceRegistrar
* @return ResultStream containing ServiceItem's
* @throws java.io.IOException
* @see ServiceItem
- * @see ServiceClasspathSubItem
+ * @see ServiceItemClasspathSub
* @see ResultStream
* @see ServiceResultStreamFilter
- * @see ResultStreamUnmarshaller
- * @since 2.3.0
+ * @see ServiceResultStreamUnmarshaller
+ * @since 3.0.0
*/
ResultStream lookup(ServiceTemplate tmpl, Class[] entryClasses,
int maxBatchSize, int limit) throws IOException;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/package.html
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/package.html?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/package.html (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/lookup/package.html Sun Nov 17 08:38:47 2013
@@ -26,5 +26,6 @@
Public API for a new lookup service. It has been provided for review,
prior to implementation. These classes may be subject to change
in a future version of River.</div>
+ @since 3.0.0
</body>
</html>
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/RFC3986URLClassLoader.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/RFC3986URLClassLoader.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/RFC3986URLClassLoader.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/RFC3986URLClassLoader.java Sun Nov 17 08:38:47 2013
@@ -91,7 +91,7 @@ import org.apache.river.impl.Messages;
* <li>Use different domain names to ensure separation of proxy classes that
* otherwise utilise identical jar files</li>
* </ol>
- *
+ * @since 3.0.0
*/
public class RFC3986URLClassLoader extends java.net.URLClassLoader {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/URIEncoderDecoder.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/URIEncoderDecoder.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/URIEncoderDecoder.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/URIEncoderDecoder.java Sun Nov 17 08:38:47 2013
@@ -37,6 +37,7 @@ import org.apache.river.impl.Messages;
* application/x-www-form-urlencoded} MIME content type. It contains helper
* methods used by the URI class, and performs encoding and decoding in a
* slightly different way than {@code URLEncoder} and {@code URLDecoder}.
+ * @since 3.0.0
*/
class URIEncoderDecoder {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/Uri.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/Uri.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/Uri.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/Uri.java Sun Nov 17 08:38:47 2013
@@ -49,6 +49,7 @@ import org.apache.river.impl.Messages;
*
* IPv6 and IPvFuture host addresses must be enclosed in square brackets as per
* RFC3986.
+ * @since 3.0.0
*/
public final class Uri implements Comparable<Uri> {
@@ -918,7 +919,7 @@ public final class Uri implements Compar
* The Uri is normalised according to RFC3986.
*
* @param unescapedString
- * @return
+ * @return an RFC3986 compliant Uri.
*/
public static Uri escapeAndCreate(String unescapedString) throws URISyntaxException{
return new Uri(quoteComponent(unescapedString, allLegalUnescaped));
@@ -930,7 +931,7 @@ public final class Uri implements Compar
*
* The escape character % is not re-encoded.
* @param nonCompliantEscapedString
- * @return
+ * @return an RFC3986 compliant Uri.
*/
public static Uri parseAndCreate(String nonCompliantEscapedString) throws URISyntaxException{
return new Uri(quoteComponent(nonCompliantEscapedString, allLegal));
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/UriParser.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/UriParser.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/UriParser.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/net/UriParser.java Sun Nov 17 08:38:47 2013
@@ -25,8 +25,8 @@ import java.util.StringTokenizer;
import org.apache.river.impl.Messages;
/**
- *
- *
+ * UriParser for parsing RFC3986 compliant URI strings.
+ * @since 3.0.0
*/
final class UriParser {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/AbstractPolicy.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/AbstractPolicy.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/AbstractPolicy.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/AbstractPolicy.java Sun Nov 17 08:38:47 2013
@@ -43,6 +43,7 @@ import java.util.concurrent.ConcurrentHa
* A common superclass with utility methods for policy providers.
*
* @author Peter Firmstone.
+ * @since 3.0.0
*/
public abstract class AbstractPolicy extends Policy {
protected final Permission umbrella = new UmbrellaGrantPermission();
@@ -62,7 +63,6 @@ public abstract class AbstractPolicy ext
* PermissionGrant implementation was mutable.
*
* @param grants
- * @return map of checked grants.
*/
protected final void checkCallerHasGrants(Collection<PermissionGrant> grants) throws SecurityException {
Iterator<PermissionGrant> grantsItr = grants.iterator();
@@ -104,7 +104,7 @@ public abstract class AbstractPolicy ext
* @param concurrencyLevel
* @param unresolvedCapacity Capacity of Map used to store
* UnresolvedPermission instances
- * @return
+ * @return PermissionCollection
* @throws IllegalArgumentException if the initial capacity is
* negative or the load factor or concurrencyLevel are
* nonpositive.
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CachingSecurityManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CachingSecurityManager.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CachingSecurityManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CachingSecurityManager.java Sun Nov 17 08:38:47 2013
@@ -23,7 +23,7 @@ package org.apache.river.api.security;
* AccessControlContexts.
*
* @author Peter Firmstone.
- * @since 2.2.1
+ * @since 3.0.0
*/
public interface CachingSecurityManager {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CertificateGrant.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CertificateGrant.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CertificateGrant.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CertificateGrant.java Sun Nov 17 08:38:47 2013
@@ -35,6 +35,7 @@ import java.util.List;
/**
*
* @author Peter Firmstone.
+ * @since 3.0.0
*/
class CertificateGrant extends PrincipalGrant {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ClassLoaderGrant.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ClassLoaderGrant.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ClassLoaderGrant.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ClassLoaderGrant.java Sun Nov 17 08:38:47 2013
@@ -28,6 +28,7 @@ import java.security.ProtectionDomain;
/**
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
class ClassLoaderGrant extends ProtectionDomainGrant {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CodeSourceRequiredPermissions.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CodeSourceRequiredPermissions.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CodeSourceRequiredPermissions.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CodeSourceRequiredPermissions.java Sun Nov 17 08:38:47 2013
@@ -25,6 +25,7 @@ import org.apache.river.api.common.Beta;
* syntax, allow a ProxyVerifier to grant these permissions dynamically.
*
* @author peter
+ * @since 3.0.0
*/
@Beta
public interface CodeSourceRequiredPermissions {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CombinerSecurityManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CombinerSecurityManager.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CombinerSecurityManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/CombinerSecurityManager.java Sun Nov 17 08:38:47 2013
@@ -76,6 +76,7 @@ import org.cliffc.high_scale_lib.NonBloc
* @see AccessControlContext
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
public class CombinerSecurityManager
extends SecurityManager implements CachingSecurityManager {
@@ -568,7 +569,7 @@ extends SecurityManager implements Cachi
* Enables customisation of permission check.
* @param pd
* @param p
- * @return
+ * @return true if ProtectionDomain pd has Permission p.
*/
protected boolean checkPermission(ProtectionDomain pd, Permission p){
return pd.implies(p);
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPermissions.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPermissions.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPermissions.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPermissions.java Sun Nov 17 08:38:47 2013
@@ -75,7 +75,7 @@ import java.util.concurrent.atomic.Atomi
* @version 0.5 2012/04/18
*
* @author Peter Firmstone
- * @since 2.2.1
+ * @since 3.0.0
* @serial permsMap
*/
final class ConcurrentPermissions extends PermissionCollection
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPolicyFile.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPolicyFile.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPolicyFile.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ConcurrentPolicyFile.java Sun Nov 17 08:38:47 2013
@@ -21,7 +21,7 @@
*
* @author Alexey V. Varlamov
* @author Peter Firmstone
- * @version $Revision$
+ * @since 3.0.0
*/
package org.apache.river.api.security;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyParser.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyParser.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyParser.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyParser.java Sun Nov 17 08:38:47 2013
@@ -17,7 +17,8 @@
/**
* @author Alexey V. Varlamov
-* @version $Revision$
+* @author Peter Firmstone.
+* @since 3.0.0
*/
package org.apache.river.api.security;
@@ -59,10 +60,10 @@ import org.apache.river.api.security.Pol
/**
* This is a basic loader of policy files. It delegates lexical analysis to
* a pluggable scanner and converts received tokens to a set of
- * {@link org.apache.river.security.PermissionGrant PermissionGrant's}.
+ * {@link org.apache.river.api.security.PermissionGrant PermissionGrant's}.
* For details of policy format, which should be identical to Sun's Java Policy
* files see the
- * {@link org.apache.river.imp.security.policy.se.ConcurrentPolicyFile default policy description}.
+ * {@link org.apache.river.api.security.ConcurrentPolicyFile default policy description}.
* <br>
* For ordinary uses, this class has just one public method <code>parse()</code>,
* which performs the main task.
@@ -72,8 +73,8 @@ import org.apache.river.api.security.Pol
* This implementation is effectively thread-safe, as it has no field references
* to data being processed (that is, passes all the data as method parameters).
*
- * @see org.apache.river.imp.security.policy.se.ConcurrentPolicyFile
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyScanner
+ * @see org.apache.river.api.security.ConcurrentPolicyFile
+ * @see org.apache.river.api.security.DefaultPolicyScanner
* @see org.apache.river.api.security.PermissionGrant
*/
class DefaultPolicyParser implements PolicyParser {
@@ -83,7 +84,7 @@ class DefaultPolicyParser implements Pol
/**
* Default constructor,
- * {@link org.apache.river.imp.security.policy.util.DefaultPolicyScanner DefaultPolicyScanner}
+ * {@link org.apache.river.api.security.DefaultPolicyScanner DefaultPolicyScanner}
* is used.
*/
DefaultPolicyParser() {
@@ -100,7 +101,7 @@ class DefaultPolicyParser implements Pol
/**
* This is the main business method. It manages loading process as follows:
* the associated scanner is used to parse the stream to a set of
- * {@link org.apache.river.imp.security.policy.util.DefaultPolicyScanner.GrantEntry composite tokens},
+ * {@link org.apache.river.api.security.DefaultPolicyScanner.GrantEntry composite tokens},
* then this set is iterated and each token is translated to a PermissionGrant.
* Semantically invalid tokens are ignored, the same as void PermissionGrant's.
* <br>
@@ -182,7 +183,7 @@ class DefaultPolicyParser implements Pol
* of the GrantEntry
* @see DefaultPolicyScanner.PrincipalEntry
* @see DefaultPolicyScanner.PermissionEntry
- * @see org.apache.river.imp.security.policy.util.PolicyUtils
+ * @see org.apache.river.api.security.PolicyUtils
*/
PermissionGrant resolveGrant(DefaultPolicyScanner.GrantEntry ge,
KeyStore ks, Properties system, boolean resolve) throws Exception {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyScanner.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyScanner.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyScanner.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DefaultPolicyScanner.java Sun Nov 17 08:38:47 2013
@@ -17,7 +17,7 @@
/**
* @author Alexey V. Varlamov
-* @version $Revision$
+* @since 3.0.0
*/
package org.apache.river.api.security;
@@ -71,7 +71,7 @@ import org.apache.river.api.security.Pol
* This implementation is effectively thread-safe, as it has no field references
* to data being processed (that is, passes all the data as method parameters).
*
- * @see org.apache.harmony.security.fortress.DefaultPolicyParser
+ * @see org.apache.river.api.security.DefaultPolicyParser
*/
class DefaultPolicyScanner {
@@ -414,10 +414,10 @@ class DefaultPolicyScanner {
/**
* Compound token representing <i>keystore </i> clause. See policy format
- * {@link org.apache.river.imp.security.policy.se.ConcurrentPolicyFile description}for details.
+ * {@link org.apache.river.api.security.ConcurrentPolicyFile description}for details.
*
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyParser
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyScanner
+ * @see org.apache.river.api.security.DefaultPolicyParser
+ * @see org.apache.river.api.security.DefaultPolicyScanner
*/
static class KeystoreEntry {
@@ -464,10 +464,10 @@ class DefaultPolicyScanner {
/**
* Compound token representing <i>grant </i> clause. See policy format
- * {@link org.apache.river.imp.security.policy.se.ConcurrentPolicyFile description}for details.
+ * {@link org.apache.river.api.security.ConcurrentPolicyFile description}for details.
*
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyParser
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyScanner
+ * @see org.apache.river.api.security.DefaultPolicyParser
+ * @see org.apache.river.api.security.DefaultPolicyScanner
*/
static class GrantEntry {
@@ -552,10 +552,10 @@ class DefaultPolicyScanner {
/**
* Compound token representing <i>principal </i> entry of a <i>grant </i>
* clause. See policy format
- * {@link org.apache.river.imp.security.policy.se.ConcurrentPolicyFile description}for details.
+ * {@link org.apache.river.api.security.ConcurrentPolicyFile description}for details.
*
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyParser
- * @see org.apache.river.imp.security.policy.util.DefaultPolicyScanner
+ * @see org.apache.river.api.security.DefaultPolicyParser
+ * @see org.apache.river.api.security.DefaultPolicyScanner
*/
static class PrincipalEntry {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegatePermission.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegatePermission.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegatePermission.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegatePermission.java Sun Nov 17 08:38:47 2013
@@ -88,6 +88,7 @@ import org.apache.river.api.security.Def
* tied to the serialized form, instead serialization proxy's are used.
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
public final class DelegatePermission extends Permission{
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegateSecurityManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegateSecurityManager.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegateSecurityManager.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/DelegateSecurityManager.java Sun Nov 17 08:38:47 2013
@@ -37,8 +37,9 @@ import java.security.ProtectionDomain;
* Delegates can be enabled at runtime by using the DelegateSecurityManager,
* but only for code that utilises delegates.
*
- * @see DelegatePermission.
+ * @see DelegatePermission
* @author Peter Firmstone
+ * @since 3.0.0
*/
public class DelegateSecurityManager extends CombinerSecurityManager {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionComparator.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionComparator.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionComparator.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionComparator.java Sun Nov 17 08:38:47 2013
@@ -49,7 +49,7 @@ import java.util.Comparator;
* FilePermissionCollection.
*
* @author Peter Firmstone.
- * @since 2.2.1
+ * @since 3.0.0
*/
public class PermissionComparator implements Comparator<Permission>, Serializable {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrant.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrant.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrant.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrant.java Sun Nov 17 08:38:47 2013
@@ -70,7 +70,7 @@ import org.apache.river.api.security.Per
* of service by an attacker that can access an acting {@link java.security.Policy}
*
* @author Peter Firmstone
- * @since 2.2.1
+ * @since 3.0.0
*/
public abstract class PermissionGrant {
/*
@@ -171,7 +171,9 @@ public abstract class PermissionGrant {
* call in our constructor is to Object constructor.
*
* @param decorated
- * @return
+ * @return true if caller has privileges and decorated isn't privileged.
+ * @throws AccessControlException
+ * @throws IllegalArgumentException
*/
private static boolean checkInvariants(PermissionGrant decorated) {
PD_GUARD.checkGuard(null);
@@ -227,8 +229,8 @@ public abstract class PermissionGrant {
* calls getPermissions.
*
* @param pd ProtectionDomain
- * @return
- * @see RevokeableDynamicPolicy
+ * @return true if implies.
+ * @see RevocablePolicy
*/
public abstract boolean implies(ProtectionDomain pd);
/**
@@ -247,15 +249,15 @@ public abstract class PermissionGrant {
/**
* Checks if this PermissionGrant applies to the passed in CodeSource
* and Principal's.
- * @param cs
- * @return
+ * @param codeSource
+ * @return true if implies.
*/
public abstract boolean implies(CodeSource codeSource, Principal[] pal);
/**
* Returns an unmodifiable Collection of permissions defined by this
* PermissionGrant, which may be empty, but not null.
- * @return
+ * @return Collection containing Permission objects.
*/
public final Collection<Permission> getPermissions(){
if (decorated != null) return decorated().getPermissions();
@@ -265,6 +267,7 @@ public abstract class PermissionGrant {
/**
* Returns true if this PermissionGrant defines no Permissions, or if
* a PermissionGrant was made to a ProtectionDomain that no longer exists.
+ * @return true if void.
*/
public abstract boolean isVoid();
@@ -272,7 +275,7 @@ public abstract class PermissionGrant {
* Provide a PermissionGrantBuilder, suitable for
* producing a new PermissionGrant.
*
- * @return
+ * @return PermissionGrantBuilder
*/
public abstract PermissionGrantBuilder getBuilderTemplate();
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilder.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilder.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilder.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilder.java Sun Nov 17 08:38:47 2013
@@ -43,6 +43,7 @@ import javax.security.auth.Subject;
*
* Single Thread use only.
* @author Peter Firmstone.
+ * @since 3.0.0
* @see PermissionGrant
*/
public abstract class PermissionGrantBuilder {
@@ -89,7 +90,7 @@ public abstract class PermissionGrantBui
* CodeSource that has the Certificates and URI RFC3986 location as specified.
* <p>
* The outcome of URI comparison is similar to
- * {@link CodeSource.implies(CodeSource)}.
+ * {@link CodeSource#implies(CodeSource)}.
* <p>
* DNS lookup is avoided for security and performance reasons,
* DNS is not authenticated and therefore cannot be trusted. Doing so,
@@ -208,7 +209,7 @@ public abstract class PermissionGrantBui
* The URI will be added to the PermissionGrant, multiple may be specified by
* calling multiple times.
*
- * @param uri - RFC3986 compliant URI or null.
+ * @param path - RFC3986 compliant URI or null.
* @return
*/
public abstract PermissionGrantBuilder uri(String path);
@@ -226,7 +227,7 @@ public abstract class PermissionGrantBui
/**
* Sets the Certificate[] a CodeSource must have to receive the PermissionGrant.
* @param certs
- * @return
+ * @return a PermissionGrantBuilder
*/
public abstract PermissionGrantBuilder certificates(Certificate[] certs);
/**
@@ -234,13 +235,13 @@ public abstract class PermissionGrantBui
* the PermissionGrant.
*
* @param pals
- * @return
+ * @return a PermissionGrantBuilder
*/
public abstract PermissionGrantBuilder principals(Principal[] pals);
/**
* Specifies Permission's to be granted.
* @param perm
- * @return
+ * @return a PermissionGrantBuilder
*/
public abstract PermissionGrantBuilder permissions(Permission[] perm);
/**
@@ -270,7 +271,7 @@ public abstract class PermissionGrantBui
/**
*
* @param domain
- * @return
+ * @return a PermissionGrantBuilder
*/
public abstract PermissionGrantBuilder setDomain(WeakReference<ProtectionDomain> domain);
}
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilderImp.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilderImp.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilderImp.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PermissionGrantBuilderImp.java Sun Nov 17 08:38:47 2013
@@ -48,6 +48,7 @@ import org.apache.river.api.net.Uri;
* is returned, this reduces the
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
class PermissionGrantBuilderImp extends PermissionGrantBuilder implements
Serializable{
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyParser.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyParser.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyParser.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyParser.java Sun Nov 17 08:38:47 2013
@@ -21,7 +21,6 @@ package org.apache.river.api.security;
import java.net.URL;
import java.util.Collection;
import java.util.Properties;
-import org.apache.river.api.security.PermissionGrant;
/**
* Parser of policy syntax.
@@ -32,6 +31,7 @@ import org.apache.river.api.security.Per
* @see ConcurrentPolicyFile
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
public interface PolicyParser {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyPermission.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyPermission.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyPermission.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyPermission.java Sun Nov 17 08:38:47 2013
@@ -1,6 +1,19 @@
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.river.api.security;
@@ -12,6 +25,7 @@ import java.security.BasicPermission;
* RemotePolicy </p>
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
public class PolicyPermission extends BasicPermission {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyUtils.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyUtils.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyUtils.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PolicyUtils.java Sun Nov 17 08:38:47 2013
@@ -17,8 +17,8 @@
/**
* @author Alexey V. Varlamov
- * @author Peter Firmstone
-* @version $Revision$
+* @author Peter Firmstone
+* @since 3.0.0
*/
package org.apache.river.api.security;
@@ -230,7 +230,7 @@ import org.apache.river.api.net.Uri;
* @param path -
* file path.
* @return - the resulting URI.
- * @throw URISyntaxException
+ * @throws URISyntaxException
*/
static URI filePathToURI(String path) throws URISyntaxException {
if (File.separatorChar == '\\' && path != null){
@@ -249,7 +249,7 @@ import org.apache.river.api.net.Uri;
* Instances of this interface are intended for resolving
* generalized expansion expressions, of the form ${{protocol:data}}.
* Such functionality is applicable to security policy files, for example.
- * @see org.apache.harmony.security.PolicyUtils#expandGeneral(String, GeneralExpansionHandler)
+ * @see org.apache.river.api.security.PolicyUtils#expandGeneral(String, GeneralExpansionHandler)
*/
static interface GeneralExpansionHandler {
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PrincipalGrant.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PrincipalGrant.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PrincipalGrant.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/PrincipalGrant.java Sun Nov 17 08:38:47 2013
@@ -21,31 +21,20 @@ package org.apache.river.api.security;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
-import java.security.AccessController;
-import java.security.AllPermission;
-import java.security.CodeSigner;
import java.security.CodeSource;
import java.security.Permission;
import java.security.Principal;
-import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.security.UnresolvedPermission;
import java.security.cert.Certificate;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
*
@@ -174,39 +163,6 @@ class PrincipalGrant extends PermissionG
return false;
}
- /**
- * Utility Method, really belongs somewhere else, but CodeSource subclasses use it.
- * @param codeSource
- * @return
- * @deprecated will be removed when CodeSource based grants are removed.
- */
- @Deprecated
- CodeSource normalizeCodeSource(CodeSource codeSource) {
- if (codeSource == null ) return null;
- URI codeSourceURI = null;
- try {
- codeSourceURI = PolicyUtils.normalizeURL(codeSource.getLocation());
- } catch (URISyntaxException ex) {
- ex.printStackTrace(System.err);
- }
- CodeSource result = codeSource;
- try {
- if ( codeSourceURI != null && codeSourceURI.toURL() != codeSource.getLocation()) {
- // URL was normalized - recreate codeSource with new URL
- CodeSigner[] signers = codeSource.getCodeSigners();
- if (signers == null) {
- result = new CodeSource(codeSourceURI.toURL(), codeSource
- .getCertificates());
- } else {
- result = new CodeSource(codeSourceURI.toURL(), signers);
- }
- }
- } catch (MalformedURLException ex) {
- ex.printStackTrace(System.err);
- }
- return result;
- }
-
/* Dynamic grant's and file policy grant's have different semantics,
* this class was originally abstract, it might be advisable to make it so
* again.
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ProtectionDomainGrant.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ProtectionDomainGrant.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ProtectionDomainGrant.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/ProtectionDomainGrant.java Sun Nov 17 08:38:47 2013
@@ -38,6 +38,7 @@ import java.util.logging.Logger;
* cannot be serialized.
*
* @author Peter Firmstone
+ * @since 3.0.0
*/
class ProtectionDomainGrant extends PrincipalGrant {
private static final long serialVersionUID = 1L;
Modified: river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/RemotePolicy.java
URL: http://svn.apache.org/viewvc/river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/RemotePolicy.java?rev=1542661&r1=1542660&r2=1542661&view=diff
==============================================================================
--- river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/RemotePolicy.java (original)
+++ river/jtsk/skunk/qa_refactor/trunk/src/org/apache/river/api/security/RemotePolicy.java Sun Nov 17 08:38:47 2013
@@ -21,6 +21,7 @@ package org.apache.river.api.security;
import java.io.IOException;
import net.jini.security.GrantPermission;
import net.jini.security.policy.UmbrellaGrantPermission;
+import org.apache.river.api.common.Beta;
/**
* <p>
@@ -82,12 +83,13 @@ import net.jini.security.policy.Umbrella
* parse standard java format policy file's, to create PermissionGrant's.
* </p>
* @author Peter Firmstone
- * @since 2.2.1
+ * @since 3.0.0
* @see GrantPermission
* @see UmbrellaGrantPermission
* @see PolicyParser
* @see PolicyPermission
*/
+@Beta
public interface RemotePolicy {
/**
* Replaces the existing RemotePolicy's PermissionGrant's.