From 8bf05d16714ec5ec23bec6d169b4b8201c463ce4 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal <gaetan.boismal@forgerock.com> Date: Mon, 28 Nov 2016 15:37:15 +0000 Subject: [PATCH] OPENDJ-3527 OPENDJ-3531 OPENDJ-1633 Fix tools bootstrap --- opendj-server-legacy/resource/config/java.properties | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/opendj-server-legacy/resource/config/java.properties b/opendj-server-legacy/resource/config/java.properties index d165d6d..028a617 100644 --- a/opendj-server-legacy/resource/config/java.properties +++ b/opendj-server-legacy/resource/config/java.properties @@ -11,7 +11,7 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2008-2010 Sun Microsystems, Inc. -# Portions Copyright 2011 ForgeRock AS. +# Portions Copyright 2011-2016 ForgeRock AS. # # This file contains the java properties that the different command lines will @@ -39,21 +39,7 @@ # modes (for instance import-ldif.offline.java-args and # import-ldif.online.java-args). # -# IMPORTANT NOTE: Once you have modified this file and set the java properties -# that you want the command-lines to use you must run the command-line -# bin/dsjavaproperties for the different scripts to be updated with the -# specified settings. -# # Examples: -# Specify to overwrite the content of the environment variable OPENDJ_JAVA_HOME -# (i.e. the contents of this properties file for the java home will be analyzed -# before checking whether OPENDJ_JAVA_HOME is specified in the environment): -# overwrite-env-java-home=true -# -# Specify to overwrite the content of the environment variable OPENDJ_JAVA_ARGS -# (i.e. the contents of this properties file for the java args will be analyzed -# before checking whether OPENDJ_JAVA_ARGS is specified in the environment): -# overwrite-env-java-args=true # # Specify to use a particular Java Virtual Machine for the offline import: # import-ldif.offline.java-home=/usr/jdk1.7 @@ -72,3 +58,9 @@ # an associated property defined: # default.java-args=-client +default.java-home=$JAVA_HOME +default.java-args=-Xms32m -client +import-ldif.offline.java-args=-server +rebuild-index.offline.java-args=-server +start-ds.java-args=-server +ldifdiff.java-args=-server -- Gitblit v1.10.0