diff options
author | gjoranv <gv@verizonmedia.com> | 2019-02-18 15:17:31 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-02-18 15:17:31 +0100 |
commit | fcdf77afeb992efad79ffa56e96195a6a3939d8d (patch) | |
tree | e917b391b13f61f5a9bfc3f30951d007929ca152 | |
parent | f0a2e6c5f2b2763af9c7f1d8c91347e79c6cc429 (diff) |
Remove references to the jdisc_start script.
-rw-r--r-- | container-search/src/main/resources/configdefinitions/qr-start.def | 4 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def index 30983b4bcc7..9f92c5001ba 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/qr-start.def @@ -37,8 +37,8 @@ qrs.env string default="" restart ## Set ulimit -v in start script? this is mainly a safeguard against JNI stuff leaking memory. ulimitv string default="" restart -## Extra class path entries, forwarded to jdisc_start. Overrides the corresponding env setting. +## Extra class path entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. jdisc.classpath_extra string default="" restart -## Extra export packages entries, forwarded to jdisc_start. Overrides the corresponding env setting. +## Extra export packages entries, forwarded to vespa-start-container_daemon. Overrides the corresponding env setting. jdisc.export_packages string default="" restart diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java b/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java index c856712e1af..e650dfc6328 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/application/package-info.java @@ -80,7 +80,7 @@ void reconfigureApplication() { * It is fairly tricky to get this right during integration testing, since dependencies might be part of the build * tree instead of being installed on the host. To facilitate this, JDisc will prefix any non-schemed location (e.g. * "my_dependency.jar") with the system property "jdisc.bundle.path". This property defaults to the current - * directory when running inside an IDE, but is set to "$VESPA_HOME/lib/jars/" by the jdisc_start script. + * directory when running inside an IDE, but is set to "$VESPA_HOME/lib/jars/" by the jdisc startup scripts. * * One may also reference system properties in a bundle location using the syntax "${propertyName}". If the property * is not found, it defaults to an empty string. @@ -118,16 +118,6 @@ $ set jdisc.application="myapp.jar" $ restart jdisc </pre> * - * For testing and development, the jDISC binary also supports command line parameters to start and stop a local - * application. - * -<pre> -$ install jdisc-dev -$ emacs src/main/java/edu/disc/MyApplication.java -$ mvn install -$ sudo jdisc_start target/myapp.jar -</pre> - * * <p>It is the responsibility of the Application itself to create, configure * and activate a Container instance. Although jDISC offers an API that allows for- and manages the change of an active * Container instance, making the necessary calls to do so is also considered Application logic. When jDISC receives an |