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 2015/12/07 05:29:56 UTC
svn commit: r1718246 - in /river/jtsk/trunk: examples/hello/
src-doc/static/release-notes/ src/org/apache/river/api/net/
src/org/apache/river/example/browser/
test/src/org/apache/river/jeri/internal/mux/
Author: peter_firmstone
Date: Mon Dec 7 04:29:56 2015
New Revision: 1718246
URL: http://svn.apache.org/viewvc?rev=1718246&view=rev
Log:
Update release notes, to include warning not to copy old examples, inserted a reference to Dennis Reedy's examples on github.
Fixed Uri and Jeri mux junit test failures for release. The one remaining test failure on Hudson appears to be network configuration related and occurs in the test code itself, so I'm not going to worry about it before the 3.0.0 release.
Removed:
river/jtsk/trunk/src-doc/static/release-notes/jinisurrogatearchitecture.html
Modified:
river/jtsk/trunk/examples/hello/index.html
river/jtsk/trunk/src-doc/static/release-notes/index.html
river/jtsk/trunk/src/org/apache/river/api/net/UriParser.java
river/jtsk/trunk/src/org/apache/river/example/browser/package.html
river/jtsk/trunk/test/src/org/apache/river/jeri/internal/mux/MuxStartTimeoutTest.java
Modified: river/jtsk/trunk/examples/hello/index.html
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/examples/hello/index.html?rev=1718246&r1=1718245&r2=1718246&view=diff
==============================================================================
--- river/jtsk/trunk/examples/hello/index.html (original)
+++ river/jtsk/trunk/examples/hello/index.html Mon Dec 7 04:29:56 2015
@@ -24,6 +24,11 @@
alink="#ffffff">
<h1>Hello Example</h1>
+<p>Note this example is obsolete as it was written before JSR 133, it is presented
+ here for historical purposes, it doesn't export
+ services safely. Do not copy this example. For a modern example
+ see <a href ="https://github.com/dreedyman/apache-river-example">
+ Dennis Reedy's apache-river-example on GitHub</a>
<h2>Introduction</h2>
<p>
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=1718246&r1=1718245&r2=1718246&view=diff
==============================================================================
--- river/jtsk/trunk/src-doc/static/release-notes/index.html (original)
+++ river/jtsk/trunk/src-doc/static/release-notes/index.html Mon Dec 7 04:29:56 2015
@@ -68,7 +68,12 @@ applications and services. To permit eff
it must first be installed as an extension in the Java 2 SDK (or JRE)
that you will be using, as described in the
<a href="../info-index.html#install">installation instructions</a>.
-This is the <i>only</i> JAR file that we recommend installing as an extension.
+This is the <i>only</i> JAR file that we recommend installing as an extension
+to avoid possible deadlock, however this is no longer necessary if using
+<code>DynamicPolicyProvider</code> with
+<a href="../api/org/apache/river/api/security/ConcurrentPolicyFile.html">
+ <code>ConcurrentPolicyFile</code></a> as the default base policy.
+It will not be possible to use the extension facility with Java 9.
<p>
To use this provider, you need to define a <i>security</i> property
(<i>not</i> a system property):
@@ -80,16 +85,7 @@ then define a <i>system</i> property:
<pre>
-Djava.security.properties=<var>path-to-file</var>/security.properties
</pre>
-when running your application. If you are using a Java 2 SDK (or JRE)
-from a vendor other than Sun, you may also need to set a security property:
-<pre>
-net.jini.security.policy.PolicyFileProvider.basePolicyClass=<var>provider-class</var>
-</pre>
-in the same <code>security.properties</code> file, where
-<var>provider-class</var> is the vendor's default policy provider class,
-which typically can be found as the value of the <code>policy.provider</code>
-security property in the <code>jre/lib/security/java.security</code> file of
-the Java 2 SDK installation.
+when running your application.
<p><dt><b><code>jsk-platform.jar</code></b>
<dd>
This JAR file contains classes and interfaces that we have chosen to include
@@ -435,6 +431,11 @@ ClassServer</a>.
Browser</a>.
<p><dt><b><code>browser-dl.jar</code></b>
<dd>The codebase JAR file for the Service Browser.
+<dd>Note that the Service Browser is an old example written before
+ the Java Memory Model JSR 133, it doesn't export
+ services safely. Do not copy this example. For a modern example
+ see <a href ="https://github.com/dreedyman/apache-river-example">
+ Dennis Reedy's apache-river-example on GitHub</a>
</dl>
</ul>
<ul><a name="persistent_outrigger_jars">
Modified: river/jtsk/trunk/src/org/apache/river/api/net/UriParser.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/api/net/UriParser.java?rev=1718246&r1=1718245&r2=1718246&view=diff
==============================================================================
--- river/jtsk/trunk/src/org/apache/river/api/net/UriParser.java (original)
+++ river/jtsk/trunk/src/org/apache/river/api/net/UriParser.java Mon Dec 7 04:29:56 2015
@@ -101,7 +101,28 @@ final class UriParser {
query = temp.substring(index + 1);
temp.delete(index, temp.length());
validateQuery(uri, query, index2 + 1 + index);
- if ("".equals(query)) query = null;
+ /**
+ * The following line of code was incorrect and caused 6 test failures.
+ * According to RFC 3986, Pages 40 and 41:
+ *
+ * For example,
+ * because the "http" scheme makes use of an authority component, has a
+ * default port of "80", and defines an empty path to be equivalent to
+ * "/", the following four URIs are equivalent:
+ *
+ * http://example.com
+ * http://example.com/
+ * http://example.com:/
+ * http://example.com:80/
+ *
+ * Normalization should not remove delimiters when their associated
+ * component is empty unless licensed to do so by the scheme
+ * specification.
+ *
+ * For example, the URI "http://example.com/?" cannot be
+ * assumed to be equivalent to any of the examples above.
+ */
+// if ("".equals(query)) query = null; //This line causes ? to be removed.
}
// Authority and Path
if (temp.length() >= 2 && temp.charAt(0) == fSlash && temp.charAt(1) == fSlash) {
Modified: river/jtsk/trunk/src/org/apache/river/example/browser/package.html
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/src/org/apache/river/example/browser/package.html?rev=1718246&r1=1718245&r2=1718246&view=diff
==============================================================================
--- river/jtsk/trunk/src/org/apache/river/example/browser/package.html (original)
+++ river/jtsk/trunk/src/org/apache/river/example/browser/package.html Mon Dec 7 04:29:56 2015
@@ -31,6 +31,12 @@ is provided as an example program within
but many who use it think
of it more as a utility than an example.
<p>
+ Note this example is obsolete as it was written before JSR 133, it is presented
+ here for historical purposes, it doesn't export
+ services safely. Do not copy this example. For a modern example
+ see <a href ="https://github.com/dreedyman/apache-river-example">
+ Dennis Reedy's apache-river-example on GitHub</a>
+<p>
This document provides the following information about the Service Browser:
<ul>
<li><a href="#running">Running the Service Browser</a>
Modified: river/jtsk/trunk/test/src/org/apache/river/jeri/internal/mux/MuxStartTimeoutTest.java
URL: http://svn.apache.org/viewvc/river/jtsk/trunk/test/src/org/apache/river/jeri/internal/mux/MuxStartTimeoutTest.java?rev=1718246&r1=1718245&r2=1718246&view=diff
==============================================================================
--- river/jtsk/trunk/test/src/org/apache/river/jeri/internal/mux/MuxStartTimeoutTest.java (original)
+++ river/jtsk/trunk/test/src/org/apache/river/jeri/internal/mux/MuxStartTimeoutTest.java Mon Dec 7 04:29:56 2015
@@ -65,7 +65,7 @@ public class MuxStartTimeoutTest {
try {
muxClient.start();
succeeded.set(true);
- } catch (IOException e) {
+ } catch (Throwable e) {
failed.set(true);
}
finished.set(true);