You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by re...@apache.org on 2008/04/25 14:09:44 UTC
svn commit: r651584 - in
/incubator/river/jtsk/trunk/src/com/sun/jini/mercury: MailboxImpl.java
package.html
Author: resendes
Date: Fri Apr 25 05:09:44 2008
New Revision: 651584
URL: http://svn.apache.org/viewvc?rev=651584&view=rev
Log:
Fix for RIVER-289
Modified:
incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java?rev=651584&r1=651583&r2=651584&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java Fri Apr 25 05:09:44 2008
@@ -1,19 +1,19 @@
/*
+ * 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
*
- * Copyright 2005 Sun Microsystems, Inc.
- *
- * Licensed 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
+ * 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 com.sun.jini.mercury;
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html?rev=651584&r1=651583&r2=651584&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html Fri Apr 25 05:09:44 2008
@@ -1,9 +1,19 @@
<!--
+ ! 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
!
- ! Copyright 2005, Sun Microsystems, Inc.
- ! Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">
- ! Apache License, Version 2.0</a>.
+ ! 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.
!-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
@@ -33,8 +43,8 @@
<p>
The JAR file <code>mercury.jar</code>, included in the <code>lib</code>
-subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
-installation, contains the classes for the three Mercury service
+subdirectory of the Apache River release installation,
+contains the classes for the three Mercury service
implementations. The <code>mercury-dl.jar</code>
and <code>jsk-dl.jar</code> files in the <code>lib-dl</code> subdirectory
contain
@@ -857,7 +867,7 @@
<li> <a href="#persistent_jrmp">Persistent</a>
<li> <a href="#activatable_jrmp">Activatable</a>
</ul>
-<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
+<li> Jini extensible remote invocation (Jini ERI) configurations
<ul>
<li> <a href="#transient">Transient</a>
<li> <a href="#persistent">Persistent</a>
@@ -875,7 +885,7 @@
<ul>
<li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
<var><b>install_dir</b></var> directory
<li> The example configuration and policy files described below are
available in the <var><b>config_dir</b></var> directory
@@ -925,7 +935,7 @@
Use this security policy file for starting and running all Mercury
configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation.<p>
+in the <code>lib</code> subdirectory of the Apache River release installation.<p>
<blockquote>
<pre>