Details
-
Bug
-
Status: Closed
-
Minor
-
Resolution: Fixed
-
River_2.1.2
-
None
Description
Need to revert the following changes:
— incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java (original)
> +++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/MailboxImpl.java Mon Apr 21 04:54: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
> *
> - * http://www.apache.org/licenses/LICENSE-2.0
> + * 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
— incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html (original)
> +++ incubator/river/jtsk/trunk/src/com/sun/jini/mercury/package.html Mon Apr 21 04:54:44 2008
> @@ -1,19 +1,9 @@
> <!--
> - ! 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
> + ! Copyright 2005, Sun Microsystems, Inc.
> + ! Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">
> + ! Apache License, Version 2.0</a>.
> !
> - ! 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">
> @@ -43,7 +33,7 @@
>
> <p>
> The JAR file <code>mercury.jar</code>, included in the <code>lib</code>
> -subdirectory of the Apache River release
> +subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
> 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
> <a name="access_control">
> <h2>Access Control Permission Targets</h2>
> @@ -808,7 +857,7 @@
> <li> <a href="#persistent_jrmp">Persistent</a>
> <li> <a href="#activatable_jrmp">Activatable</a>
> </ul>
> -<li> Jini extensible remote invocation (Jini ERI) configurations
> +<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
> <ul>
> <li> <a href="#transient">Transient</a>
> <li> <a href="#persistent">Persistent</a>
> @@ -826,7 +875,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 Apache River release has been installed in the
> +<li> The starter kit 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
> @@ -876,7 +925,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 Apache River release installation.<p>
> +in the <code>lib</code> subdirectory of the starter kit installation.<p>
>
> <blockquote>
> <pre>