73 files changed, 1096 insertions, 0 deletions

diff --git a/net.jini/.classpath b/net.jini/.classpath
new file mode 100644
index 00000000000..eaa0471e2d0
--- /dev/null
+++ b/net.jini/.classpath
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<classpath>

+	<classpathentry kind="src" path="src"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/browser.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/checkconfigurationfile.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/checkser.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/classdep.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/classserver.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/computedigest.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/computehttpmdcodebase.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/destroy.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/envcheck.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/fiddler.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/group.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jarwrapper.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jini-core.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jini-ext.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jsk-debug-policy.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jsk-lib.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jsk-platform.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/jsk-resources.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/mahalo.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/mercury.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/norm.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/outrigger.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/outrigger-logstore.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/outrigger-snaplogstore.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/phoenix.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/phoenix-group.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/phoenix-init.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/prebuilt-outrigger-logstore.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/preferredlistgen.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/reggie.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/sharedvm.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/start.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/sun-util.jar"/>

+	<classpathentry exported="true" kind="lib" path="jini2_1/lib/tools.jar" sourcepath="jini2_1/source.zip"/>

+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="output" path="bin"/>

+</classpath>

diff --git a/net.jini/.project b/net.jini/.project
new file mode 100644
index 00000000000..97cadaa7e9f
--- /dev/null
+++ b/net.jini/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<projectDescription>

+	<name>net.jini</name>

+	<comment></comment>

+	<projects>

+	</projects>

+	<buildSpec>

+		<buildCommand>

+			<name>org.eclipse.jdt.core.javabuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.ManifestBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+		<buildCommand>

+			<name>org.eclipse.pde.SchemaBuilder</name>

+			<arguments>

+			</arguments>

+		</buildCommand>

+	</buildSpec>

+	<natures>

+		<nature>org.eclipse.pde.PluginNature</nature>

+		<nature>org.eclipse.jdt.core.javanature</nature>

+	</natures>

+</projectDescription>

diff --git a/net.jini/META-INF/MANIFEST.MF b/net.jini/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..d788c2baadd
--- /dev/null
+++ b/net.jini/META-INF/MANIFEST.MF
@@ -0,0 +1,133 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Jini Plug-in (Incubation)
+Bundle-SymbolicName: net.jini
+Bundle-Version: 2.1.0.qualifier
+Bundle-ClassPath: jini.jar,
+ jini2_1/lib/browser.jar,
+ jini2_1/lib/checkconfigurationfile.jar,
+ jini2_1/lib/checkser.jar,
+ jini2_1/lib/classdep.jar,
+ jini2_1/lib/classserver.jar,
+ jini2_1/lib/computedigest.jar,
+ jini2_1/lib/computehttpmdcodebase.jar,
+ jini2_1/lib/destroy.jar,
+ jini2_1/lib/envcheck.jar,
+ jini2_1/lib/fiddler.jar,
+ jini2_1/lib/group.jar,
+ jini2_1/lib/jarwrapper.jar,
+ jini2_1/lib/jini-core.jar,
+ jini2_1/lib/jini-ext.jar,
+ jini2_1/lib/jsk-debug-policy.jar,
+ jini2_1/lib/jsk-lib.jar,
+ jini2_1/lib/jsk-platform.jar,
+ jini2_1/lib/jsk-resources.jar,
+ jini2_1/lib/mahalo.jar,
+ jini2_1/lib/mercury.jar,
+ jini2_1/lib/norm.jar,
+ jini2_1/lib/outrigger.jar,
+ jini2_1/lib/outrigger-logstore.jar,
+ jini2_1/lib/outrigger-snaplogstore.jar,
+ jini2_1/lib/phoenix.jar,
+ jini2_1/lib/phoenix-group.jar,
+ jini2_1/lib/phoenix-init.jar,
+ jini2_1/lib/prebuilt-outrigger-logstore.jar,
+ jini2_1/lib/preferredlistgen.jar,
+ jini2_1/lib/reggie.jar,
+ jini2_1/lib/sharedvm.jar,
+ jini2_1/lib/start.jar,
+ jini2_1/lib/sun-util.jar,
+ jini2_1/lib/tools.jar
+Bundle-Activator: net.jini.JiniPlugin
+Bundle-Vendor: Sun
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Eclipse-LazyStart: true
+Export-Package: com.sun.jini.action,
+ com.sun.jini.admin,
+ com.sun.jini.collection,
+ com.sun.jini.config,
+ com.sun.jini.constants,
+ com.sun.jini.discovery,
+ com.sun.jini.discovery.internal,
+ com.sun.jini.discovery.kerberos,
+ com.sun.jini.discovery.plaintext,
+ com.sun.jini.discovery.ssl,
+ com.sun.jini.discovery.x500.sha1withdsa,
+ com.sun.jini.discovery.x500.sha1withrsa,
+ com.sun.jini.example.browser,
+ com.sun.jini.fiddler,
+ com.sun.jini.jeri.internal.connection,
+ com.sun.jini.jeri.internal.http,
+ com.sun.jini.jeri.internal.mux,
+ com.sun.jini.jeri.internal.runtime,
+ com.sun.jini.landlord,
+ com.sun.jini.lease,
+ com.sun.jini.loader.pref.internal,
+ com.sun.jini.logging,
+ com.sun.jini.lookup.entry,
+ com.sun.jini.mahalo,
+ com.sun.jini.mahalo.log,
+ com.sun.jini.mercury,
+ com.sun.jini.norm,
+ com.sun.jini.norm.event,
+ com.sun.jini.norm.lookup,
+ com.sun.jini.outrigger,
+ com.sun.jini.outrigger.logstore,
+ com.sun.jini.outrigger.snaplogstore,
+ com.sun.jini.phoenix,
+ com.sun.jini.phoenix.resources,
+ com.sun.jini.proxy,
+ com.sun.jini.reggie,
+ com.sun.jini.reliableLog,
+ com.sun.jini.resource,
+ com.sun.jini.start,
+ com.sun.jini.start.resources,
+ com.sun.jini.system,
+ com.sun.jini.thread,
+ com.sun.jini.tool,
+ com.sun.jini.tool.envcheck,
+ com.sun.jini.tool.envcheck.plugins,
+ com.sun.jini.tool.envcheck.plugins.resources,
+ com.sun.jini.tool.envcheck.resources,
+ com.sun.jini.tool.resources,
+ net.jini,
+ net.jini.activation,
+ net.jini.admin,
+ net.jini.config,
+ net.jini.constraint,
+ net.jini.core.constraint,
+ net.jini.core.discovery,
+ net.jini.core.entry,
+ net.jini.core.event,
+ net.jini.core.lease,
+ net.jini.core.lookup,
+ net.jini.core.transaction,
+ net.jini.core.transaction.server,
+ net.jini.discovery,
+ net.jini.entry,
+ net.jini.event,
+ net.jini.export,
+ net.jini.id,
+ net.jini.iiop,
+ net.jini.io,
+ net.jini.io.context,
+ net.jini.jeri,
+ net.jini.jeri.connection,
+ net.jini.jeri.http,
+ net.jini.jeri.kerberos,
+ net.jini.jeri.ssl,
+ net.jini.jeri.tcp,
+ net.jini.jrmp,
+ net.jini.lease,
+ net.jini.loader,
+ net.jini.loader.pref,
+ net.jini.lookup,
+ net.jini.lookup.entry,
+ net.jini.security,
+ net.jini.security.policy,
+ net.jini.security.proxytrust,
+ net.jini.space,
+ net.jini.url.file,
+ net.jini.url.httpmd,
+ net.jini.url.https
diff --git a/net.jini/build.properties b/net.jini/build.properties
new file mode 100644
index 00000000000..8d9bbaa5237
--- /dev/null
+++ b/net.jini/build.properties
@@ -0,0 +1,40 @@
+source.jini.jar = src/

+output.jini.jar = bin/

+bin.includes = plugin.xml,\

+               jini.jar,\

+               META-INF/,\

+               src/,\

+               jini2_1/lib/browser.jar,\

+               jini2_1/lib/checkconfigurationfile.jar,\

+               jini2_1/lib/checkser.jar,\

+               jini2_1/lib/classdep.jar,\

+               jini2_1/lib/classserver.jar,\

+               jini2_1/lib/computedigest.jar,\

+               jini2_1/lib/computehttpmdcodebase.jar,\

+               jini2_1/lib/destroy.jar,\

+               jini2_1/lib/envcheck.jar,\

+               jini2_1/lib/fiddler.jar,\

+               jini2_1/lib/group.jar,\

+               jini2_1/lib/jarwrapper.jar,\

+               jini2_1/lib/jini-core.jar,\

+               jini2_1/lib/jini-ext.jar,\

+               jini2_1/lib/jsk-debug-policy.jar,\

+               jini2_1/lib/jsk-lib.jar,\

+               jini2_1/lib/jsk-platform.jar,\

+               jini2_1/lib/jsk-resources.jar,\

+               jini2_1/lib/mahalo.jar,\

+               jini2_1/lib/mercury.jar,\

+               jini2_1/lib/norm.jar,\

+               jini2_1/lib/outrigger.jar,\

+               jini2_1/lib/outrigger-logstore.jar,\

+               jini2_1/lib/outrigger-snaplogstore.jar,\

+               jini2_1/lib/phoenix.jar,\

+               jini2_1/lib/phoenix-group.jar,\

+               jini2_1/lib/phoenix-init.jar,\

+               jini2_1/lib/prebuilt-outrigger-logstore.jar,\

+               jini2_1/lib/preferredlistgen.jar,\

+               jini2_1/lib/reggie.jar,\

+               jini2_1/lib/sharedvm.jar,\

+               jini2_1/lib/start.jar,\

+               jini2_1/lib/sun-util.jar,\

+               jini2_1/lib/tools.jar

diff --git a/net.jini/jini2_1/LICENSE b/net.jini/jini2_1/LICENSE
new file mode 100644
index 00000000000..261eeb9e9f8
--- /dev/null
+++ b/net.jini/jini2_1/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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
+
+   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.
diff --git a/net.jini/jini2_1/NOTICE b/net.jini/jini2_1/NOTICE
new file mode 100644
index 00000000000..7e0e6a56b3a
--- /dev/null
+++ b/net.jini/jini2_1/NOTICE
@@ -0,0 +1,5 @@
+This product includes material developed by Sun Microsystems, Inc.
+(http://www.sun.com).
+
+This product contains code derived from the Ant build script contributed 
+to the Jini Community by Geoffrey Arnold (http://www.geoffreyarnold.com).
diff --git a/net.jini/jini2_1/configentry/ServiceDiscoveryManager b/net.jini/jini2_1/configentry/ServiceDiscoveryManager
new file mode 100644
index 00000000000..94a6b3e1d71
--- /dev/null
+++ b/net.jini/jini2_1/configentry/ServiceDiscoveryManager
@@ -0,0 +1,9 @@
+# ServiceDiscoveryManager configuration entries
+net.jini.lookup.ServiceDiscoveryManager.cacheTaskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.ServiceDiscoveryManager.discardTaskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.ServiceDiscoveryManager.discardWait: long
+net.jini.lookup.ServiceDiscoveryManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.ServiceDiscoveryManager.eventLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.ServiceDiscoveryManager.eventListenerExporter: net.jini.export.Exporter
+net.jini.lookup.ServiceDiscoveryManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.ServiceDiscoveryManager.registrarPreparer: net.jini.security.ProxyPreparer
diff --git a/net.jini/jini2_1/configentry/WakeupManager b/net.jini/jini2_1/configentry/WakeupManager
new file mode 100644
index 00000000000..f46cfcabf9b
--- /dev/null
+++ b/net.jini/jini2_1/configentry/WakeupManager
@@ -0,0 +1,2 @@
+# WakeupManager configuration entries
+com.sun.jini.thread.WakeupManager.queueThreadTimeout: long
diff --git a/net.jini/jini2_1/configentry/fiddler-transient b/net.jini/jini2_1/configentry/fiddler-transient
new file mode 100644
index 00000000000..5c7a7890027
--- /dev/null
+++ b/net.jini/jini2_1/configentry/fiddler-transient
@@ -0,0 +1,46 @@
+# transient fiddler configuration entries
+com.sun.jini.fiddler.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.fiddler.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.fiddler.initialLookupGroups: String[]
+com.sun.jini.fiddler.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.fiddler.leaseBound: long
+com.sun.jini.fiddler.leaseMax: long
+com.sun.jini.fiddler.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.fiddler.locatorToDiscoverPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.fiddler.locatorToJoinPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.fiddler.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.fiddler.serverExporter: net.jini.export.Exporter
+com.sun.jini.fiddler.taskManager: com.sun.jini.thread.TaskManager
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/mercury-persistent b/net.jini/jini2_1/configentry/mercury-persistent
new file mode 100644
index 00000000000..e550fe1fa1f
--- /dev/null
+++ b/net.jini/jini2_1/configentry/mercury-persistent
@@ -0,0 +1,50 @@
+# non-activatable persistent mercury configuration entries
+com.sun.jini.mercury.logToSnapshotThreshold: int
+com.sun.jini.mercury.persistenceDirectory: String
+com.sun.jini.mercury.recoveredListenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.mercury.recoveredLocatorToJoinPreparer: net.jini.security.ProxyPreparer
+
+# transient mercury configuration entries
+com.sun.jini.mercury.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.mercury.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.mercury.initialLookupGroups: String[]
+com.sun.jini.mercury.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.mercury.leasePeriodPolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.mercury.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.mercury.locatorToJoinPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.mercury.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.mercury.notificationsTaskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.mercury.serverExporter: net.jini.export.Exporter
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/norm-activatable b/net.jini/jini2_1/configentry/norm-activatable
new file mode 100644
index 00000000000..0fd717886c6
--- /dev/null
+++ b/net.jini/jini2_1/configentry/norm-activatable
@@ -0,0 +1,56 @@
+# activatable persistent norm configuration entries
+com.sun.jini.norm.activationIdPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.activationSystemPreparer: net.jini.security.ProxyPreparer
+# non-activatable persistent norm configuration entries
+com.sun.jini.norm.persistenceDirectory: String
+com.sun.jini.norm.persistenceSnapshotThreshold: int
+com.sun.jini.norm.persistenceSnapshotWeight: float
+com.sun.jini.norm.recoveredLeasePreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.recoveredListenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.recoveredLocatorPreparer: net.jini.security.ProxyPreparer
+# transient norm configuration entries
+com.sun.jini.norm.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.norm.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.norm.initialLookupGroups: String[]
+com.sun.jini.norm.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.norm.isolateSets: boolean
+com.sun.jini.norm.leaseManager: net.jini.lease.LeaseRenewalManager
+com.sun.jini.norm.leasePolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.norm.leasePreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.locatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.norm.serverExporter: net.jini.export.Exporter
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/norm-transient b/net.jini/jini2_1/configentry/norm-transient
new file mode 100644
index 00000000000..6547da8f2c6
--- /dev/null
+++ b/net.jini/jini2_1/configentry/norm-transient
@@ -0,0 +1,46 @@
+# transient norm configuration entries
+com.sun.jini.norm.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.norm.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.norm.initialLookupGroups: String[]
+com.sun.jini.norm.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.norm.isolateSets: boolean
+com.sun.jini.norm.leaseManager: net.jini.lease.LeaseRenewalManager
+com.sun.jini.norm.leasePolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.norm.leasePreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.locatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.norm.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.norm.serverExporter: net.jini.export.Exporter
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/outrigger-persistent b/net.jini/jini2_1/configentry/outrigger-persistent
new file mode 100644
index 00000000000..b7ee5e596a5
--- /dev/null
+++ b/net.jini/jini2_1/configentry/outrigger-persistent
@@ -0,0 +1,63 @@
+# non-activatable persistent outrigger configuration entries
+com.sun.jini.outrigger.gcInterval: int
+com.sun.jini.outrigger.maxOps: int
+com.sun.jini.outrigger.persistenceDirectory: String
+com.sun.jini.outrigger.recoveredListenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.recoveredLookupLocatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.recoveredTransactionManagerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.store: com.sun.jini.outrigger.Store
+# transient outrigger configuration entries
+com.sun.jini.outrigger.contentsLeasePeriodPolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.outrigger.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.outrigger.entryLeasePeriodPolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.outrigger.eventLeasePolicy: com.sun.jini.landlord.LeasePeriodPolicy
+com.sun.jini.outrigger.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.outrigger.initialLookupGroups: String[]
+com.sun.jini.outrigger.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.outrigger.iteratorBatchSize: int
+com.sun.jini.outrigger.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.outrigger.lookupLocatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.maxServerQueryTimeout: long
+com.sun.jini.outrigger.maxUnexportDelay: long
+com.sun.jini.outrigger.notificationsTaskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.outrigger.reapingInterval: long
+com.sun.jini.outrigger.reapingPriority: int
+com.sun.jini.outrigger.serverExporter: net.jini.export.Exporter
+com.sun.jini.outrigger.takeMultipleLimit: int
+com.sun.jini.outrigger.transactionManagerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.outrigger.txnMonitorTaskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.outrigger.unexportRetryDelay: long
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/phoenix b/net.jini/jini2_1/configentry/phoenix
new file mode 100644
index 00000000000..7a8179ecfa1
--- /dev/null
+++ b/net.jini/jini2_1/configentry/phoenix
@@ -0,0 +1,17 @@
+# phoenix configuration entries
+com.sun.jini.phoenix.activatorExporter: net.jini.export.Exporter
+com.sun.jini.phoenix.groupConfig: String[]
+com.sun.jini.phoenix.groupLocation: String
+com.sun.jini.phoenix.groupOptions: String[]
+com.sun.jini.phoenix.groupOutputHandler: com.sun.jini.phoenix.GroupOutputHandler
+com.sun.jini.phoenix.groupThrottle: int
+com.sun.jini.phoenix.groupTimeout: int
+com.sun.jini.phoenix.instantiatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.phoenix.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.phoenix.monitorExporter: net.jini.export.Exporter
+com.sun.jini.phoenix.persistenceDirectory: String
+com.sun.jini.phoenix.persistenceSnapshotThreshold: int
+com.sun.jini.phoenix.registryExporter: net.jini.export.Exporter
+com.sun.jini.phoenix.systemExporter: net.jini.export.Exporter
+com.sun.jini.phoenix.unexportTimeout: int
+com.sun.jini.phoenix.unexportWait: int
diff --git a/net.jini/jini2_1/configentry/phoenix-stop b/net.jini/jini2_1/configentry/phoenix-stop
new file mode 100644
index 00000000000..4a2654e14b5
--- /dev/null
+++ b/net.jini/jini2_1/configentry/phoenix-stop
@@ -0,0 +1,5 @@
+# phoenix -stop configuration entries
+com.sun.jini.phoenix.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.phoenix.registryHost: String
+com.sun.jini.phoenix.registryPort: int
+com.sun.jini.phoenix.systemPreparer: net.jini.security.ProxyPreparer
diff --git a/net.jini/jini2_1/configentry/reggie-activatable b/net.jini/jini2_1/configentry/reggie-activatable
new file mode 100644
index 00000000000..fae1235f4c8
--- /dev/null
+++ b/net.jini/jini2_1/configentry/reggie-activatable
@@ -0,0 +1,66 @@
+# activatable persistent reggie configuration entries
+com.sun.jini.reggie.activationIdPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.activationSystemPreparer: net.jini.security.ProxyPreparer
+# non-activatable persistent reggie configuration entries
+com.sun.jini.reggie.persistenceDirectory: String
+com.sun.jini.reggie.persistenceSnapshotThreshold: int
+com.sun.jini.reggie.persistenceSnapshotWeight: float 
+com.sun.jini.reggie.recoveredListenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.recoveredLocatorPreparer: net.jini.security.ProxyPreparer
+# transient reggie configuration entries
+com.sun.jini.reggie.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+com.sun.jini.reggie.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.reggie.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.reggie.initialLookupGroups: String[]
+com.sun.jini.reggie.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.reggie.initialMemberGroups: String[]
+com.sun.jini.reggie.initialUnicastDiscoveryPort: int
+com.sun.jini.reggie.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.locatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.reggie.minMaxEventLease: long
+com.sun.jini.reggie.minMaxServiceLease: long
+com.sun.jini.reggie.minRenewalInterval: long
+com.sun.jini.reggie.multicastAnnouncementInterval: long
+com.sun.jini.reggie.multicastInterfaceRetryInterval: int
+com.sun.jini.reggie.multicastInterfaces: java.net.NetworkInterface[]
+com.sun.jini.reggie.multicastRequestSubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+com.sun.jini.reggie.resourceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.serverExporter: net.jini.export.Exporter
+com.sun.jini.reggie.serviceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.taskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.reggie.unicastDiscoveryHost: String
+com.sun.jini.reggie.unicastDiscoverySubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/reggie-persistent b/net.jini/jini2_1/configentry/reggie-persistent
new file mode 100644
index 00000000000..3b8fd4c2b87
--- /dev/null
+++ b/net.jini/jini2_1/configentry/reggie-persistent
@@ -0,0 +1,63 @@
+# non-activatable persistent reggie configuration entries
+com.sun.jini.reggie.persistenceDirectory: String
+com.sun.jini.reggie.persistenceSnapshotThreshold: int
+com.sun.jini.reggie.persistenceSnapshotWeight: float 
+com.sun.jini.reggie.recoveredListenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.recoveredLocatorPreparer: net.jini.security.ProxyPreparer
+# transient reggie configuration entries
+com.sun.jini.reggie.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+com.sun.jini.reggie.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.reggie.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.reggie.initialLookupGroups: String[]
+com.sun.jini.reggie.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.reggie.initialMemberGroups: String[]
+com.sun.jini.reggie.initialUnicastDiscoveryPort: int
+com.sun.jini.reggie.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.locatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.reggie.minMaxEventLease: long
+com.sun.jini.reggie.minMaxServiceLease: long
+com.sun.jini.reggie.minRenewalInterval: long
+com.sun.jini.reggie.multicastAnnouncementInterval: long
+com.sun.jini.reggie.multicastInterfaceRetryInterval: int
+com.sun.jini.reggie.multicastInterfaces: java.net.NetworkInterface[]
+com.sun.jini.reggie.multicastRequestSubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+com.sun.jini.reggie.resourceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.serverExporter: net.jini.export.Exporter
+com.sun.jini.reggie.serviceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.taskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.reggie.unicastDiscoveryHost: String
+com.sun.jini.reggie.unicastDiscoverySubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/reggie-transient b/net.jini/jini2_1/configentry/reggie-transient
new file mode 100644
index 00000000000..73423fef99e
--- /dev/null
+++ b/net.jini/jini2_1/configentry/reggie-transient
@@ -0,0 +1,57 @@
+# transient reggie configuration entries
+com.sun.jini.reggie.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+com.sun.jini.reggie.discoveryManager: net.jini.discovery.DiscoveryManagement
+com.sun.jini.reggie.initialLookupAttributes: net.jini.core.entry.Entry[]
+com.sun.jini.reggie.initialLookupGroups: String[]
+com.sun.jini.reggie.initialLookupLocators: net.jini.core.discovery.LookupLocator[]
+com.sun.jini.reggie.initialMemberGroups: String[]
+com.sun.jini.reggie.initialUnicastDiscoveryPort: int
+com.sun.jini.reggie.listenerPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.locatorPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.reggie.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.reggie.minMaxEventLease: long
+com.sun.jini.reggie.minMaxServiceLease: long
+com.sun.jini.reggie.minRenewalInterval: long
+com.sun.jini.reggie.multicastAnnouncementInterval: long
+com.sun.jini.reggie.multicastInterfaceRetryInterval: int
+com.sun.jini.reggie.multicastInterfaces: java.net.NetworkInterface[]
+com.sun.jini.reggie.multicastRequestSubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+com.sun.jini.reggie.resourceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.serverExporter: net.jini.export.Exporter
+com.sun.jini.reggie.serviceIdGenerator: com.sun.jini.reggie.UuidGenerator
+com.sun.jini.reggie.taskManager: com.sun.jini.thread.TaskManager
+com.sun.jini.reggie.unicastDiscoveryHost: String
+com.sun.jini.reggie.unicastDiscoverySubjectChecker: com.sun.jini.discovery.ClientSubjectChecker
+# JoinManager configuration entries
+net.jini.lookup.JoinManager.discoveryManager: net.jini.discovery.DiscoveryManagement
+net.jini.lookup.JoinManager.leaseManager: net.jini.lease.LeaseRenewalManager
+net.jini.lookup.JoinManager.maxLeaseDuration: long
+net.jini.lookup.JoinManager.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.registrationPreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.serviceLeasePreparer: net.jini.security.ProxyPreparer
+net.jini.lookup.JoinManager.taskManager: com.sun.jini.thread.TaskManager
+net.jini.lookup.JoinManager.wakeupManager: com.sun.jini.thread.WakeupManager
+net.jini.lookup.JoinManager.wakeupRetries: int
+# LeaseRenewalManager configuration entries
+net.jini.lease.LeaseRenewalManager.renewBatchTimeWindow: long
+net.jini.lease.LeaseRenewalManager.roundTripTime: long
+net.jini.lease.LeaseRenewalManager.taskManager: com.sun.jini.thread.TaskManager
+# LookupDiscovery configuration entries
+net.jini.discovery.LookupDiscovery.discoveryConstraints: net.jini.core.constraint.MethodConstraints
+net.jini.discovery.LookupDiscovery.finalMulticastRequestInterval: long
+net.jini.discovery.LookupDiscovery.initialMulticastRequestDelayRange: long
+net.jini.discovery.LookupDiscovery.multicastAnnouncementInterval: long
+net.jini.discovery.LookupDiscovery.multicastInterfaceRetryInterval: int
+net.jini.discovery.LookupDiscovery.multicastInterfaces: java.net.NetworkInterface[]
+net.jini.discovery.LookupDiscovery.multicastRequestHost: String
+net.jini.discovery.LookupDiscovery.multicastRequestInterval: long
+net.jini.discovery.LookupDiscovery.multicastRequestMax: int
+net.jini.discovery.LookupDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupDiscovery.unicastDelayRange: long
+net.jini.discovery.LookupDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
+# LookupLocatorDiscovery configuration entries
+net.jini.discovery.LookupLocatorDiscovery.initialUnicastDelayRange: long
+net.jini.discovery.LookupLocatorDiscovery.registrarPreparer: net.jini.security.ProxyPreparer
+net.jini.discovery.LookupLocatorDiscovery.taskManager: com.sun.jini.thread.TaskManager
+net.jini.discovery.LookupLocatorDiscovery.wakeupManager: com.sun.jini.thread.WakeupManager
diff --git a/net.jini/jini2_1/configentry/start b/net.jini/jini2_1/configentry/start
new file mode 100644
index 00000000000..373ee011405
--- /dev/null
+++ b/net.jini/jini2_1/configentry/start
@@ -0,0 +1,7 @@
+# start.jar ServiceStarter configuration entries
+com.sun.jini.start.activationIDPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.start.activationSystemPreparer: net.jini.security.ProxyPreparer
+com.sun.jini.start.loginContext: javax.security.auth.login.LoginContext
+com.sun.jini.start.serviceDescriptors: com.sun.jini.start.ServiceDescriptor[]
+com.sun.jini.start.serviceDestructors: com.sun.jini.start.ServiceDescriptor[]
+com.sun.jini.start.servicePreparer: net.jini.security.ProxyPreparer
diff --git a/net.jini/jini2_1/doc.zip b/net.jini/jini2_1/doc.zip
new file mode 100644
index 00000000000..f869f6297cd
--- /dev/null
+++ b/net.jini/jini2_1/doc.zip
diff --git a/net.jini/jini2_1/index.html b/net.jini/jini2_1/index.html
new file mode 100644
index 00000000000..9aba64f07d0
--- /dev/null
+++ b/net.jini/jini2_1/index.html
@@ -0,0 +1,58 @@
+<!--
+ ! 
+ ! Copyright 2005, Sun Microsystems, Inc.
+ ! Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">
+ ! Apache License, Version 2.0</a>.
+ ! 
+ !-->
+<body text="#000000" bgcolor="#ffffff" link="#9b37cc"
+      vlink="#cc1877" alink="#ffffff">
+
+<title>Jini(TM) Technology Starter Kit Index</title>
+
+<center><h1>Jini(TM) Technology Starter Kit<BR>v2.1</h1></center>
+<hr>
+<UL>
+<LI><B><a href="doc/info-index.html">Getting Started & More</a></B>
+<p>
+<LI><B>Informative reading</B>
+    <ul>
+    <li><i><a href="doc/arch2_0.html">Jini(TM) Technology Starter Kit Overview</a></i>
+    <li><i><a href="doc/specs/html/jini-spec.html">Jini(TM) Architecture</a></i></i>
+
+</ul> 
+<p>
+<LI><B><a href="doc/release-notes/new.html">What's new in this release</a></B>   
+<p>
+<LI><B><a href="doc/release-notes/index.html">Release Notes</a></B>
+<p>
+<LI><B><a href="doc/manpages-index.html">Manual Pages</a></B> for services, utilities, and tools
+<p>
+<LI><B><a href="doc/spec-index.html">Specifications</a></B>
+<p>
+<LI><B>API documentation</B>
+	<UL>
+	<LI><a href="doc/api/index.html"> Frames version</a>
+	<LI><a href="doc/api/overview-summary.html"> No Frames version</a>
+	</UL>
+
+<p>
+
+</UL>
+<p>
+<p>
+<hr>
+Copyright 2005, Sun Microsystems, Inc.<br>
+Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">
+Apache License, Version 2.0</a>.
+
+
+
+</body>
+</html>
+
+
+
+
+
+
diff --git a/net.jini/jini2_1/lib-dl/browser-dl.jar b/net.jini/jini2_1/lib-dl/browser-dl.jar
new file mode 100644
index 00000000000..fdce995bb64
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/browser-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/fiddler-dl.jar b/net.jini/jini2_1/lib-dl/fiddler-dl.jar
new file mode 100644
index 00000000000..60f04a38112
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/fiddler-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/group-dl.jar b/net.jini/jini2_1/lib-dl/group-dl.jar
new file mode 100644
index 00000000000..866b5db89c1
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/group-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/jsk-dl.jar b/net.jini/jini2_1/lib-dl/jsk-dl.jar
new file mode 100644
index 00000000000..c5362a519dd
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/jsk-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/mahalo-dl.jar b/net.jini/jini2_1/lib-dl/mahalo-dl.jar
new file mode 100644
index 00000000000..dbe4ff82dce
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/mahalo-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/mercury-dl.jar b/net.jini/jini2_1/lib-dl/mercury-dl.jar
new file mode 100644
index 00000000000..c8aede7be14
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/mercury-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/norm-dl.jar b/net.jini/jini2_1/lib-dl/norm-dl.jar
new file mode 100644
index 00000000000..388fdc34469
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/norm-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/outrigger-dl.jar b/net.jini/jini2_1/lib-dl/outrigger-dl.jar
new file mode 100644
index 00000000000..e5319effcbc
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/outrigger-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/phoenix-dl.jar b/net.jini/jini2_1/lib-dl/phoenix-dl.jar
new file mode 100644
index 00000000000..cc92fe1e337
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/phoenix-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/reggie-dl.jar b/net.jini/jini2_1/lib-dl/reggie-dl.jar
new file mode 100644
index 00000000000..d8bda8834d6
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/reggie-dl.jar
diff --git a/net.jini/jini2_1/lib-dl/sdm-dl.jar b/net.jini/jini2_1/lib-dl/sdm-dl.jar
new file mode 100644
index 00000000000..4e7a754307b
--- /dev/null
+++ b/net.jini/jini2_1/lib-dl/sdm-dl.jar
diff --git a/net.jini/jini2_1/lib-ext/jsk-policy.jar b/net.jini/jini2_1/lib-ext/jsk-policy.jar
new file mode 100644
index 00000000000..0dcca10965e
--- /dev/null
+++ b/net.jini/jini2_1/lib-ext/jsk-policy.jar
diff --git a/net.jini/jini2_1/lib/browser.jar b/net.jini/jini2_1/lib/browser.jar
new file mode 100644
index 00000000000..b904b5da304
--- /dev/null
+++ b/net.jini/jini2_1/lib/browser.jar
diff --git a/net.jini/jini2_1/lib/checkconfigurationfile.jar b/net.jini/jini2_1/lib/checkconfigurationfile.jar
new file mode 100644
index 00000000000..e00fcf1302a
--- /dev/null
+++ b/net.jini/jini2_1/lib/checkconfigurationfile.jar
diff --git a/net.jini/jini2_1/lib/checkser.jar b/net.jini/jini2_1/lib/checkser.jar
new file mode 100644
index 00000000000..7b02d20e292
--- /dev/null
+++ b/net.jini/jini2_1/lib/checkser.jar
diff --git a/net.jini/jini2_1/lib/classdep.jar b/net.jini/jini2_1/lib/classdep.jar
new file mode 100644
index 00000000000..bda9e77939b
--- /dev/null
+++ b/net.jini/jini2_1/lib/classdep.jar
diff --git a/net.jini/jini2_1/lib/classserver.jar b/net.jini/jini2_1/lib/classserver.jar
new file mode 100644
index 00000000000..31070f987b7
--- /dev/null
+++ b/net.jini/jini2_1/lib/classserver.jar
diff --git a/net.jini/jini2_1/lib/computedigest.jar b/net.jini/jini2_1/lib/computedigest.jar
new file mode 100644
index 00000000000..1eeec4ab72c
--- /dev/null
+++ b/net.jini/jini2_1/lib/computedigest.jar
diff --git a/net.jini/jini2_1/lib/computehttpmdcodebase.jar b/net.jini/jini2_1/lib/computehttpmdcodebase.jar
new file mode 100644
index 00000000000..4ee1c01fa7f
--- /dev/null
+++ b/net.jini/jini2_1/lib/computehttpmdcodebase.jar
diff --git a/net.jini/jini2_1/lib/destroy.jar b/net.jini/jini2_1/lib/destroy.jar
new file mode 100644
index 00000000000..bf76efb84cd
--- /dev/null
+++ b/net.jini/jini2_1/lib/destroy.jar
diff --git a/net.jini/jini2_1/lib/envcheck.jar b/net.jini/jini2_1/lib/envcheck.jar
new file mode 100644
index 00000000000..5912ac5dfc0
--- /dev/null
+++ b/net.jini/jini2_1/lib/envcheck.jar
diff --git a/net.jini/jini2_1/lib/fiddler.jar b/net.jini/jini2_1/lib/fiddler.jar
new file mode 100644
index 00000000000..2c9e64984ea
--- /dev/null
+++ b/net.jini/jini2_1/lib/fiddler.jar
diff --git a/net.jini/jini2_1/lib/group.jar b/net.jini/jini2_1/lib/group.jar
new file mode 100644
index 00000000000..ed2b03067a8
--- /dev/null
+++ b/net.jini/jini2_1/lib/group.jar
diff --git a/net.jini/jini2_1/lib/jarwrapper.jar b/net.jini/jini2_1/lib/jarwrapper.jar
new file mode 100644
index 00000000000..ebc7f04464f
--- /dev/null
+++ b/net.jini/jini2_1/lib/jarwrapper.jar
diff --git a/net.jini/jini2_1/lib/jini-core.jar b/net.jini/jini2_1/lib/jini-core.jar
new file mode 100644
index 00000000000..4d0543f82c2
--- /dev/null
+++ b/net.jini/jini2_1/lib/jini-core.jar
diff --git a/net.jini/jini2_1/lib/jini-ext.jar b/net.jini/jini2_1/lib/jini-ext.jar
new file mode 100644
index 00000000000..16132547ba6
--- /dev/null
+++ b/net.jini/jini2_1/lib/jini-ext.jar
diff --git a/net.jini/jini2_1/lib/jsk-debug-policy.jar b/net.jini/jini2_1/lib/jsk-debug-policy.jar
new file mode 100644
index 00000000000..22aacae1051
--- /dev/null
+++ b/net.jini/jini2_1/lib/jsk-debug-policy.jar
diff --git a/net.jini/jini2_1/lib/jsk-lib.jar b/net.jini/jini2_1/lib/jsk-lib.jar
new file mode 100644
index 00000000000..7a65cae3395
--- /dev/null
+++ b/net.jini/jini2_1/lib/jsk-lib.jar
diff --git a/net.jini/jini2_1/lib/jsk-platform.jar b/net.jini/jini2_1/lib/jsk-platform.jar
new file mode 100644
index 00000000000..647658db5ea
--- /dev/null
+++ b/net.jini/jini2_1/lib/jsk-platform.jar
diff --git a/net.jini/jini2_1/lib/jsk-resources.jar b/net.jini/jini2_1/lib/jsk-resources.jar
new file mode 100644
index 00000000000..2ef9f7f3393
--- /dev/null
+++ b/net.jini/jini2_1/lib/jsk-resources.jar
diff --git a/net.jini/jini2_1/lib/mahalo.jar b/net.jini/jini2_1/lib/mahalo.jar
new file mode 100644
index 00000000000..f0ef06fa009
--- /dev/null
+++ b/net.jini/jini2_1/lib/mahalo.jar
diff --git a/net.jini/jini2_1/lib/mercury.jar b/net.jini/jini2_1/lib/mercury.jar
new file mode 100644
index 00000000000..3c97d2d4ed0
--- /dev/null
+++ b/net.jini/jini2_1/lib/mercury.jar
diff --git a/net.jini/jini2_1/lib/norm.jar b/net.jini/jini2_1/lib/norm.jar
new file mode 100644
index 00000000000..b8a12ea59b0
--- /dev/null
+++ b/net.jini/jini2_1/lib/norm.jar
diff --git a/net.jini/jini2_1/lib/outrigger-logstore.jar b/net.jini/jini2_1/lib/outrigger-logstore.jar
new file mode 100644
index 00000000000..aa14929826c
--- /dev/null
+++ b/net.jini/jini2_1/lib/outrigger-logstore.jar
diff --git a/net.jini/jini2_1/lib/outrigger-snaplogstore.jar b/net.jini/jini2_1/lib/outrigger-snaplogstore.jar
new file mode 100644
index 00000000000..a2c078f0dc6
--- /dev/null
+++ b/net.jini/jini2_1/lib/outrigger-snaplogstore.jar
diff --git a/net.jini/jini2_1/lib/outrigger.jar b/net.jini/jini2_1/lib/outrigger.jar
new file mode 100644
index 00000000000..ec47189a186
--- /dev/null
+++ b/net.jini/jini2_1/lib/outrigger.jar
diff --git a/net.jini/jini2_1/lib/phoenix-group.jar b/net.jini/jini2_1/lib/phoenix-group.jar
new file mode 100644
index 00000000000..4007b43c2b8
--- /dev/null
+++ b/net.jini/jini2_1/lib/phoenix-group.jar
diff --git a/net.jini/jini2_1/lib/phoenix-init.jar b/net.jini/jini2_1/lib/phoenix-init.jar
new file mode 100644
index 00000000000..d6aa3778e2a
--- /dev/null
+++ b/net.jini/jini2_1/lib/phoenix-init.jar
diff --git a/net.jini/jini2_1/lib/phoenix.jar b/net.jini/jini2_1/lib/phoenix.jar
new file mode 100644
index 00000000000..573a22af15e
--- /dev/null
+++ b/net.jini/jini2_1/lib/phoenix.jar
diff --git a/net.jini/jini2_1/lib/prebuilt-outrigger-logstore.jar b/net.jini/jini2_1/lib/prebuilt-outrigger-logstore.jar
new file mode 100644
index 00000000000..101fe7a5268
--- /dev/null
+++ b/net.jini/jini2_1/lib/prebuilt-outrigger-logstore.jar
diff --git a/net.jini/jini2_1/lib/preferredlistgen.jar b/net.jini/jini2_1/lib/preferredlistgen.jar
new file mode 100644
index 00000000000..92ff5002abc
--- /dev/null
+++ b/net.jini/jini2_1/lib/preferredlistgen.jar
diff --git a/net.jini/jini2_1/lib/reggie.jar b/net.jini/jini2_1/lib/reggie.jar
new file mode 100644
index 00000000000..a85c3bea1e1
--- /dev/null
+++ b/net.jini/jini2_1/lib/reggie.jar
diff --git a/net.jini/jini2_1/lib/sharedvm.jar b/net.jini/jini2_1/lib/sharedvm.jar
new file mode 100644
index 00000000000..d5d62a2a645
--- /dev/null
+++ b/net.jini/jini2_1/lib/sharedvm.jar
diff --git a/net.jini/jini2_1/lib/start.jar b/net.jini/jini2_1/lib/start.jar
new file mode 100644
index 00000000000..d15796e5ec2
--- /dev/null
+++ b/net.jini/jini2_1/lib/start.jar
diff --git a/net.jini/jini2_1/lib/sun-util.jar b/net.jini/jini2_1/lib/sun-util.jar
new file mode 100644
index 00000000000..120ff82d6c0
--- /dev/null
+++ b/net.jini/jini2_1/lib/sun-util.jar
diff --git a/net.jini/jini2_1/lib/tools.jar b/net.jini/jini2_1/lib/tools.jar
new file mode 100644
index 00000000000..46b96ade654
--- /dev/null
+++ b/net.jini/jini2_1/lib/tools.jar
diff --git a/net.jini/jini2_1/source.zip b/net.jini/jini2_1/source.zip
new file mode 100644
index 00000000000..27ebb2abe6f
--- /dev/null
+++ b/net.jini/jini2_1/source.zip
diff --git a/net.jini/jini_config/jsk-all.policy b/net.jini/jini_config/jsk-all.policy
new file mode 100644
index 00000000000..c9ee1cace21
--- /dev/null
+++ b/net.jini/jini_config/jsk-all.policy
@@ -0,0 +1,3 @@
+grant codebase "file:${osee.jini.install}/lib/*" {

+    permission java.security.AllPermission;

+};
\ No newline at end of file
diff --git a/net.jini/jini_config/start-transient-jeri-services.config b/net.jini/jini_config/start-transient-jeri-services.config
new file mode 100644
index 00000000000..2e34dff68b2
--- /dev/null
+++ b/net.jini/jini_config/start-transient-jeri-services.config
@@ -0,0 +1,40 @@
+import com.sun.jini.start.NonActivatableServiceDescriptor;

+import com.sun.jini.start.ServiceDescriptor;

+

+com.sun.jini.start {

+

+    //

+    // HTTPD Service

+    //

+    private static httpd_codebase = "";

+    private static httpd_policy = "${osee.jini.config}/jsk-all.policy";

+    private static httpd_classpath = "${osee.jini.install}/lib/classserver.jar";

+    private static httpd_impl = "com.sun.jini.tool.ClassServer";

+    private static httpd_service = 

+        new NonActivatableServiceDescriptor(

+            httpd_codebase, httpd_policy, httpd_classpath, httpd_impl,

+            new String[]{"-port", "${osee.classserver.port}", "-dir", "${osee.jini.install}/lib-dl", "-verbose"});

+	   

+    //	   

+    // Fiddler (Lookup Discovery Service)

+    //

+  

+    //	   

+    // Reggie (Lookup Service)

+    //

+    private static reggie_codebase = "http://${osee.classserver.host}:${osee.classserver.port}/reggie-dl.jar"

+	+ " http://${osee.classserver.host}:${osee.classserver.port}/jsk-dl.jar";

+    private static reggie_policy = "${osee.jini.config}/jsk-all.policy";

+    private static reggie_classpath = "${osee.jini.install}/lib/reggie.jar";

+    private static reggie_config = "${osee.jini.config}/transient-reggie.config";

+    private static reggie_impl = "com.sun.jini.reggie.TransientRegistrarImpl";

+    private static reggie_service = 

+        new NonActivatableServiceDescriptor(

+            reggie_codebase, reggie_policy, reggie_classpath, 

+	    reggie_impl, new String[] { reggie_config });

+

+    static serviceDescriptors = new ServiceDescriptor[] {

+        httpd_service,

+		reggie_service

+    };

+}
\ No newline at end of file
diff --git a/net.jini/jini_config/transient-reggie.config b/net.jini/jini_config/transient-reggie.config
new file mode 100644
index 00000000000..b4919e31f7f
--- /dev/null
+++ b/net.jini/jini_config/transient-reggie.config
@@ -0,0 +1,3 @@
+com.sun.jini.reggie {

+    initialMemberGroups = new String[] { "${osee.jini.lookup.groups}" };

+}
\ No newline at end of file
diff --git a/net.jini/plugin.xml b/net.jini/plugin.xml
new file mode 100644
index 00000000000..dbc928d71cc
--- /dev/null
+++ b/net.jini/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<?eclipse version="3.0"?>

+<plugin>

+

+    
+</plugin>

diff --git a/net.jini/src/net/jini/JiniPlugin.java b/net.jini/src/net/jini/JiniPlugin.java
new file mode 100644
index 00000000000..96bd942cfb2
--- /dev/null
+++ b/net.jini/src/net/jini/JiniPlugin.java
@@ -0,0 +1,51 @@
+

+package net.jini;

+

+import java.net.URL;

+

+import org.eclipse.core.runtime.FileLocator;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.core.runtime.Plugin;

+import org.osgi.framework.Bundle;

+

+/**

+ * The main plug-in class to be used in the desktop.

+ */

+public class JiniPlugin extends Plugin {

+

+   private static JiniPlugin plugin;

+   private String[] serviceGroups;

+

+   public JiniPlugin() {

+      plugin = this;

+      serviceGroups = null;

+   }

+

+   public static JiniPlugin getInstance() {

+      return plugin;

+   }

+

+   public String[] getJiniVersion() {

+//      if (serviceGroups == null) {

+         Bundle bundle = Platform.getBundle("net.jini");

+         try {

+            if (bundle != null) {

+               URL home = FileLocator.resolve(bundle.getEntry("/"));

+               String id = home.getFile();

+               if (id.endsWith("/")) {

+                  id = id.substring(0, id.length() - 1);

+               }

+               id = id.substring(id.lastIndexOf("/") + 1, id.length());

+               System.out.println("Service group id: " + id);

+               serviceGroups = new String[1];

+               serviceGroups[0] = id;

+            }

+         }

+         catch (Exception e) {

+            System.err.println("Failed to extract jini version");

+            e.printStackTrace();

+         }

+//      }

+      return serviceGroups;

+   }

+}