Index: jini/src/org/netbeans/modules/jini/services/outofbox/TransientReggie.java =================================================================== RCS file: /cvs/jini/src/org/netbeans/modules/jini/services/outofbox/TransientReggie.java,v retrieving revision 1.6 diff -u -r1.6 TransientReggie.java --- jini/src/org/netbeans/modules/jini/services/outofbox/TransientReggie.java 1 Mar 2002 16:29:10 -0000 1.6 +++ jini/src/org/netbeans/modules/jini/services/outofbox/TransientReggie.java 13 Nov 2002 21:49:51 -0000 @@ -19,8 +19,6 @@ import org.netbeans.modules.jini.services.spi.*; import org.netbeans.modules.jini.servlets.*; -import org.netbeans.modules.jini.Version; - import org.openide.util.HttpServer; /** @@ -36,9 +34,6 @@ // it is a part of module layer private static final String REGGIE_POLICY = "Jini/OutOfBox/reggie.policy"; // NOI18N - //!!! module jar file, it must be in sync with Ant build script - private static final String JINI_JAR = Version.getModuleJarName(); - // normalized root (without terminating slash) private String root; private String groups; @@ -134,12 +129,9 @@ // class path must contain module and reggie String user = System.getProperty("netbeans.user"); // NOI18N - String module = user + slash + "modules" + slash + JINI_JAR; // NOI18N - File test = new File(module); - if (test.exists() == false) { - String install = System.getProperty("netbeans.home"); // NOI18N - module = install + slash + "modules" + slash + JINI_JAR; // NOI18N - } + // Could also use InstalledFileLocator here, but since we only need to know the location + // of jini.jar anyway.... + String module = TransientReggie.class.getProtectionDomain().getCodeSource().getLocation().getPath(); File lib = new File(getJSKRoot() + slash + "lib" + slash + "reggie.jar"); // NOI18N String separator = System.getProperty("path.separator"); // NOI18N String options = "-Djava.class.path=" + module + separator + lib.getAbsolutePath(); // NOI18N