Permalink
Browse files

Merged changes from trunk into release tag

git-svn-id: https://svn.apache.org/repos/asf/river/jtsk/tags/2.2.0@1137621 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
2 parents ea5fb0e + 1b9fc65 commit e2ea9f79a504b8df23592403bd0b32bec2ad2d1e Tom Hobbs committed Jun 20, 2011
Showing with 2,369 additions and 1,086 deletions.
  1. +0 −10 DISCLAIMER
  2. +24 −11 build.xml
  3. +112 −0 roll_release.sh
  4. +11 −13 src-doc/static/arch2_0.html
  5. +4 −4 src-doc/static/index.html
  6. +1 −1 src-doc/static/info-index.html
  7. +1 −1 src-doc/static/manpages-index.html
  8. +28 −1 src-doc/static/release-notes/index.html
  9. +4 −5 src-doc/static/release-notes/jeri.html
  10. +1 −5 src-doc/static/release-notes/loader.html
  11. +1 −5 src-doc/static/release-notes/norm.html
  12. +6 −2 src-doc/static/spec-index.html
  13. +31 −5 src/com/sun/jini/jeri/internal/mux/Mux.java
  14. +62 −131 src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java
  15. +118 −0 src/com/sun/jini/jeri/internal/runtime/Binding.java
  16. +252 −0 src/com/sun/jini/jeri/internal/runtime/DgcRequestDispatcher.java
  17. +3 −3 src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java
  18. +144 −0 src/com/sun/jini/jeri/internal/runtime/JvmLifeSupport.java
  19. +98 −0 src/com/sun/jini/jeri/internal/runtime/Lease.java
  20. +265 −863 src/com/sun/jini/jeri/internal/runtime/ObjectTable.java
  21. +41 −0 src/com/sun/jini/jeri/internal/runtime/SequenceEntry.java
  22. +496 −0 src/com/sun/jini/jeri/internal/runtime/Target.java
  23. +1 −1 src/manifest/jsk-resources/META-INF/services/net.jini.config.Configuration
  24. 0 src/{com/sun → net}/jini/config/GroovyConfig.groovy
  25. +4 −0 src/net/jini/config/package.html
  26. +13 −1 src/net/jini/jeri/connection/ConnectionManager.java
  27. +48 −20 src/net/jini/loader/pref/PreferredClassProvider.java
  28. +248 −0 test/src/com/sun/jini/discovery/DiscoveryConstraintsTest.java
  29. +154 −0 test/src/com/sun/jini/discovery/plaintext/ClientTest.java
  30. +113 −0 test/src/com/sun/jini/discovery/ssl/ClientTest.java
  31. +85 −0 test/src/com/sun/jini/jeri/internal/mux/MuxStartTimeoutTest.java
  32. +0 −4 test/src/com/sun/jini/outrigger/FastListTest.java
View
@@ -1,10 +0,0 @@
-
-Apache River is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is
-required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making
-process have stabilized in a manner consistent with other successful
-ASF projects. While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate that
-the project has yet to be fully endorsed by the ASF.
-
View
@@ -73,9 +73,8 @@
</target>
<fileset id="river.bin.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${lib}/**"/>
<include name="${lib-dl}/**"/>
@@ -84,9 +83,8 @@
</fileset>
<fileset id="river.doc.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${doc}/**"/>
<exclude name="${doc}/release-notes/new.html"/>
@@ -112,10 +110,10 @@
<include name="${lib-ext}/**"/>
<include name="${doc}/**"/>
<include name="harness/**"/>
- <include name="README.txt"/>
+ <include name="README*"/>
</fileset>-->
- <target name="release-bin" description="Create a binary release" depends="all.build">
+ <target name="release-bin" description="Create a binary release" depends="duplicate-text-files, all.build">
<!-- TODO: add depends: javadoc-internals and remove from ci-build -->
<mkdir dir="${dist.dir}"/>
@@ -178,10 +176,15 @@
<include name="${doc}/**"/>
<exclude name="${doc.api}/"/>
<include name="build.xml"/>
- <include name="README*.txt"/>
+ <include name="README*"/>
</fileset>
- <target name="release-doc" description="Create release doc archives" depends="river-doc">
+ <target name="duplicate-text-files" description="Creates friendly txt versions of common files">
+ <copy file="LICENSE" toFile="LICENSE.txt"/>
+ <copy file="NOTICE" toFile="NOTICE.txt"/>
+ </target>
+
+ <target name="release-doc" description="Create release doc archives" depends="duplicate-text-files, river-doc">
<mkdir dir="${dist.dir}"/>
<delete file="${doc.zip.bundle}"/>
@@ -194,7 +197,7 @@
</tar>
</target>
- <target name="release-src" description="Create a source release">
+ <target name="release-src" description="Create a source release" depends="duplicate-text-files">
<mkdir dir="${dist.dir}"/>
<delete file="${src.zip.bundle}"/>
<zip destfile="${src.zip.bundle}" roundup="yes">
@@ -361,6 +364,7 @@
<package name="net.jini.url.https"/>
</javadoc>
<mkdir dir="${doc.api.dir}/doc-files"/>
+ <copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
</target>
@@ -389,6 +393,7 @@
<sourcepath refid="javadoc.sourcepath" />
</javadoc>
<mkdir dir="${doc.internals.dir}/doc-files"/>
+ <copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE"/>
</target>
@@ -450,6 +455,7 @@
</javadoc>
<mkdir dir="${doc.spec.api.dir}/doc-files"/>
<copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE"/>
+ <copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE.txt"/>
</target>
<!-- =========== ... ============ -->
@@ -2174,6 +2180,13 @@
<property name="harness.generateHtml" value="${harness.generateHtml}" />
</ant>
</target>
+
+ <target name="qa.run-tests" depends="" description="Run Specific QA tests">
+ <!-- Call qa subcomponent build -->
+ <ant dir="qa" target="run-tests" inheritall="false">
+ <property name="harness.generateHtml" value="${harness.generateHtml}" />
+ </ant>
+ </target>
<target name="all.build" depends="river-runtime"
description="Build all, including subcomponents">
View
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+function test_tar_release {
+ TMP_DIR=tar_release_test
+
+ mkdir $TMP_DIR
+ cp dist/apache-river-$VERSION-src.tar.gz $TMP_DIR
+ cd $TMP_DIR
+
+ tar xf apache-river-$VERSION-src.tar.gz
+ cd apache-river-2.2.0
+
+ ant build
+
+ echo
+ echo "Release built from TAR correctly"
+
+ cd ../..
+
+ rm -rf $TMP_DIR
+}
+
+function test_zip_release {
+ TMP_DIR=zip_release_test
+
+ mkdir $TMP_DIR
+ cp dist/apache-river-$VERSION-src.zip $TMP_DIR
+ cd $TMP_DIR
+
+ unzip apache-river-$VERSION-src.zip
+ cd apache-river-$VERSION
+
+ ant build
+
+ echo
+ echo "Release built from ZIP correctly"
+
+ cd ../..
+
+ rm -rf $TMP_DIR
+}
+
+function sign_all {
+ echo
+ echo "Signing release artifacts"
+
+ cd dist
+ for f in $( ls ); do
+ gpg --armor --output $f.asc --detach-sign $f
+ gpg --print-md SHA512 $f > $f.sha
+ done
+ cd ..
+}
+
+function rat_report {
+ echo
+ echo "Running RAT report"
+
+ if [ "${RAT_HOME+x}" = "x" ]; then
+ echo "Using RAT_HOME=${RAT_HOME}"
+ else
+ echo "Please set RAT_HOME before continuing"
+ exit 1
+ fi
+
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d src > RAT_REPORT_src.txt
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d examples -e *.mf > RAT_REPORT_examples.txt
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d qa/jtreg -e *.mf > RAT_REPORT_qa_jtreg.txt
+
+ mv RAT_REPORT* dist/
+}
+
+function upload_all {
+ UPLOAD_DEST=$1
+
+ echo
+ echo "Uploading artifacts to $UPLOAD_DEST"
+
+ cd dist
+ scp * $UPLOAD_DEST
+ cd ..
+}
+
+function confirm_continue {
+ QUIT_MSG=$1
+
+ echo
+ echo "Continue? [Yy]ess [Nn]o"
+ read CONTINUE
+
+ [[ 'n' = $CONTINUE || 'N' = $CONTINUE ]] && echo $QUIT_MSG
+}
+
+VERSION=2.2.0
+
+echo "Rolling River Release $VERSION"
+
+echo
+echo "Checking repo status"
+
+svn st
+
+confirm_continue "Please Update repo state and then re-run this script."
+
+ant release
+
+test_tar_release
+test_zip_release
+
+sign_all
+rat_report
+upload_all thobbs@people.apache.org:~/public_html/river/
@@ -19,23 +19,22 @@
<body text="#000000" bgcolor="#ffffff" link="#9b37cc"
vlink="#cc1877" alink="#ffffff">
-<title>Jini Architecture Specification Version 2.0 Overview - Apache River Release v2.1.2</title>
+<title>Jini Specification Overview - Apache River Release v2.2.0</title>
<a name="TOP">
-<center><h1>Jini<font><sup>TM</sup></font> Architecture Specification Version 2.0 Extensions Overview<br>
- Apache River Release v2.1.2</h1></center>
+<center><h1>Jini Specification Overview<br>
+ Apache River Release v2.2.0</h1></center>
<br>
-<p>This document provides an overview of the new components of
-the Jini<font size="-1"><sup>TM</sup></font> v2.0 Architecture included in Apache River and
-explains how the components fit together and fit within the
-existing Jini<font size="-1"><sup>TM</sup></font> technology infrastructure. Much of this
+<p>This document provides an overview of the implementation details of
+Jini Specifications included in Apache River and
+explains how these components fit together. Much of this
information is available in the package, interface, and class
documentation, but this document provides a higher-level overview
and indicates where to find more information.
-<h2>1 Overview of Jini<font size="-1"><sup>TM</sup></font> Architecture</h2>
+<h2>1 Overview of Jini Architecture</h2>
<p>The Jini system architecture consists of three categories:
<i>programming model</i>, <i>infrastructure</i>, and <i>services</i>.
@@ -81,7 +80,7 @@
<li><a href="api/net/jini/security/ProxyPreparer.html">ProxyPreparer</a>
</ul>
-<p><i>New Infrastructure</i>
+<p><i>Additional Infrastructure</i>
<ul>
<li><a href="api/net/jini/security/package-summary.html">Security</a>
<li><a href="api/net/jini/core/constraint/package-summary.html">Invocation Constraints</a>
@@ -92,15 +91,14 @@
<li><a href="api/com/sun/jini/discovery/package-summary.html">Discovery Protocol v2</a>
</ul>
-<p><i>Updates to Services</i>
+<p><i>Configuring Services</i>
-<p>Each service has been updated to support being
+<p>Each service included in Apache River supports being
configured using a <code>Configuration</code>. Most of the
services were previously configured via system properties. These
services can now be configured via entries in the configuration.
New types of behavior that can be configured are remote service
-exporting and proxy preparation.
-
+exporting and proxy preparation.</p>
<h3>1.1 Goals</h3>
@@ -23,7 +23,7 @@
<center><h1>Apache River Release<BR>v2.2.0</h1></center>
<hr>
<p>
-The Apache River release is based on the following two major contributions:
+The Apache River release is built on the following two major original contributions:
the Jini Technology Starter Kit, and Service UI. In the documentation for this
release, you may see historical references to those releases.
@@ -33,16 +33,16 @@
<p>
<LI><B>Informative reading</B>
<ul>
- <li><i><a href="arch2_0.html">Jini<font size="-1"><sup>TM</sup></font> Architecture Specification Version 2.0 Extensions</a></i>
- <li><i><a href="specs/html/jini-spec.html">Jini<font size="-1"><sup>TM</sup></font> Architecture Specification Version 1.0</a></i>
+ <li><i><a href="arch2_0.html">Jini Specification Overview</a></i>
+ <li><i><a href="specs/html/jini-spec.html">Jini Architecture Specification Version 1.0</a></i>
</ul>
<p>
<LI><B><a href="release-notes/index.html">Release Notes</a></B>
<p>
<LI><B><a href="manpages-index.html">Manual Pages</a></B> for services, utilities, and tools
<p>
-<LI><B><a href="spec-index.html">Specifications</a></B>
+<LI><B><a href="spec-index.html">Jini Network Technology Specifications</a></B>
<p>
<LI><B>API documentation</B>
<UL>
@@ -20,7 +20,7 @@
<title>Apache River Release Getting Started & More</title>
-<center><h1>Apache River Release<BR>Getting Started & More with v2.1.2</h1></center>
+<center><h1>Apache River Release<BR>Getting Started & More with v2.2.0</h1></center>
<UL><UL>
<LI><a href="#examine">Examining the distribution</a>
<LI><a href="#install">Installing the <code>jsk-policy.jar</code> file</a>
@@ -22,7 +22,7 @@
<h1><center>Apache River Release
-<br>v2.1.2 Manual Pages</center></h1><br>
+<br>v2.2.0 Manual Pages</center></h1><br>
<hr>
Oops, something went wrong.

0 comments on commit e2ea9f7

Please sign in to comment.