- * The user might have specified JVM options as well as ACC options as - * well as arguments to be passed to the client. Further, we need to make - * sure that the GlassFish extension libraries directories and endorsed - * directories are included in java.ext.dirs and java.endorsed.dirs, - * regardless of whether the user specified any explicitly. + * The user might have specified JVM options as well as ACC options as well as arguments to be passed to the client. + * Further, we need to make sure that the GlassFish extension libraries directories and endorsed directories are + * included in java.ext.dirs and java.endorsed.dirs, regardless of whether the user specified any explicitly. *
- * This program emits a java command line that will run the ACC so that it - * will launch the client. The emitted command will need to look like this: + * This program emits a java command line that will run the ACC so that it will launch the client. The emitted command + * will need to look like this: + * *
* {@code
* java \
@@ -76,21 +75,19 @@
* -javaagent:(path-to-gf-client.jar)=(option string for our agent) \
* (main class setting: "-jar x.jar" or "a.b.Main" or "path-to-file.class")
* (arguments to be passed to the client)
- * }
+ * }
+ *
*
- * The general design of this class uses several inner classes, CommandLineElement
- * and its extensions. These classes have slightly different behavior depending
- * on the specific type of command line element each represents. Each has
- * a regex pattern which it uses to decide whether it recognizes a particular
- * command line element or not. Each also implements (or inherits) the
- * processValue method which actually consumes the command line element being
- * handled -- and sometimes the next one as well if the element takes a value
- * (such as -classpath).
+ * The general design of this class uses several inner classes, CommandLineElement and its extensions. These classes
+ * have slightly different behavior depending on the specific type of command line element each represents. Each has a
+ * regex pattern which it uses to decide whether it recognizes a particular command line element or not. Each also
+ * implements (or inherits) the processValue method which actually consumes the command line element being handled --
+ * and sometimes the next one as well if the element takes a value (such as -classpath).
*
* @author Tim Quinn
*/
public class CLIBootstrap {
-
+
public final static String FILE_OPTIONS_INTRODUCER = "argsfile=";
private final static String COMMA_IN_ARG_PLACEHOLDER = "+-+-+-+";
@@ -100,42 +97,29 @@ public class CLIBootstrap {
final static String ENV_VAR_PROP_PREFIX = "acc.";
/** options to the ACC that take a value */
- private final static String ACC_VALUED_OPTIONS_PATTERN =
- "-mainclass|-name|-xml|-configxml|-user|-password|-passwordfile|-targetserver";
+ private final static String ACC_VALUED_OPTIONS_PATTERN = "-mainclass|-name|-xml|-configxml|-user|-password|-passwordfile|-targetserver";
/** options to the ACC that take no value */
- private final static String ACC_UNVALUED_OPTIONS_PATTERN =
- "-textauth|-noappinvoke|-usage|-help";
-
- private final static String JVM_VALUED_OPTIONS_PATTERN =
- "-classpath|-cp";
-
+ private final static String ACC_UNVALUED_OPTIONS_PATTERN = "-textauth|-noappinvoke|-usage|-help|-debug";
+ private final static String JVM_VALUED_OPTIONS_PATTERN = "-classpath|-cp";
private final static String INSTALL_ROOT_PROPERTY_EXPR = "-Dcom.sun.aas.installRoot=";
private final static String SECURITY_POLICY_PROPERTY_EXPR = "-Djava.security.policy=";
private final static String SECURITY_AUTH_LOGIN_CONFIG_PROPERTY_EXPR = "-Djava.security.auth.login.config=";
- private final static String SYSTEM_CLASS_LOADER_PROPERTY_EXPR =
- "-Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader";
+ private final static String SYSTEM_CLASS_LOADER_PROPERTY_EXPR = "-Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader";
- private final static String[] ENV_VARS = {
- "_AS_INSTALL", "APPCPATH", "VMARGS"};
+ private final static String[] ENV_VARS = { "_AS_INSTALL", "APPCPATH", "VMARGS" };
private final static String EXT_DIRS_INTRODUCER = "-Djava.ext.dirs";
private final static String ENDORSED_DIRS_INTRODUCER = "-Djava.endorsed.dirs";
- private static final LocalStringManager localStrings = new LocalStringManagerImpl(CLIBootstrap.class);
-
private JavaInfo java;
-
private GlassFishInfo gfInfo;
-
private UserVMArgs userVMArgs;
/**
* set up during init with various subtypes of command line elements
*/
- private CommandLineElement
- extDirs, endorsedDirs, accValuedOptions, accUnvaluedOptions,
- jvmPropertySettings, jvmValuedOptions, otherJVMOptions, arguments;
+ private CommandLineElement extDirs, endorsedDirs, accValuedOptions, accUnvaluedOptions, jvmPropertySettings, jvmValuedOptions, otherJVMOptions, arguments;
/** arguments passed to the ACC Java agent */
private final AgentArgs agentArgs = new AgentArgs();
@@ -145,9 +129,9 @@ public class CLIBootstrap {
/** command line elements from most specific to least specific matching pattern */
private CommandLineElement[] elementsInScanOrder;
-
- /** command line elements in the order they should appear on the generated
- * command line
+
+ /**
+ * command line elements in the order they should appear on the generated command line
*/
private CommandLineElement[] elementsInOutputOrder;
@@ -156,31 +140,25 @@ public class CLIBootstrap {
*/
public static void main(String[] args) {
try {
- /*
- * Convert env vars to properties. (This makes testing easier.)
- */
+ //Convert env vars to properties. (This makes testing easier.)
envToProps();
- final CLIBootstrap boot = new CLIBootstrap();
- /*
- * Because of how Windows passes arguments, the calling Windows
- * script assigned the input arguments to an environment variable.
- * Parse that variable's value into the actual arguments.
- */
+
+ // Because of how Windows passes arguments, the calling Windows script assigned the input arguments to an environment
+ // variable. Parse that variable's value into the actual arguments.
if (INPUT_ARGS != null) {
args = convertInputArgsVariable(INPUT_ARGS);
}
- final String outputCommandLine = boot.run(args);
+
+ String outputCommandLine = new CLIBootstrap().run(args);
if (isDebug) {
System.err.println(outputCommandLine);
}
- /*
- * Write the generated java command to System.out. The calling
- * shell script will execute this command.
- *
- * Using print instead of println seems to work better. Using
- * println added a \r to the end of the last command-line argument
- * on Windows under cygwin.
- */
+
+ // Write the generated java command to System.out. The calling shell script will execute this command.
+ //
+ // Using print instead of println seems to work better. Using println added a \r to the end of the last command-line
+ // argument on Windows under cygwin.
+ //
System.out.print(outputCommandLine);
} catch (Exception ex) {
ex.printStackTrace();
@@ -191,37 +169,35 @@ public static void main(String[] args) {
}
/**
- * Replaces commas in an argument value (which can confuse the ACC agent
- * argument parsing because shells strip out double-quotes) with a special
- * sequence.
+ * Replaces commas in an argument value (which can confuse the ACC agent argument parsing because shells strip out
+ * double-quotes) with a special sequence.
*
- * @param s string to encode
+ * @param input string to encode
* @return encoded string
*/
- public static String encodeArg(final String s) {
- return s.replace(",", COMMA_IN_ARG_PLACEHOLDER);
+ public static String encodeArg(String input) {
+ return input.replace(",", COMMA_IN_ARG_PLACEHOLDER);
}
/**
* Replaces occurrences of comma encoding with commas.
*
- * @param s possibly encoded string
+ * @param input possibly encoded string
* @return decoded string
*/
- public static String decodeArg(final String s) {
- return s.replace(COMMA_IN_ARG_PLACEHOLDER, ",");
+ public static String decodeArg(String input) {
+ return input.replace(COMMA_IN_ARG_PLACEHOLDER, ",");
}
- private static String[] convertInputArgsVariable(final String inputArgs) {
+ private static String[] convertInputArgsVariable(String inputArgs) {
/*
- * The pattern matches a quoted string (double quotes around a string
- * containing no double quote) or a non-quoted string (a string containing
- * no white space or quotes).
+ * The pattern matches a quoted string (double quotes around a string containing no double quote) or a non-quoted string
+ * (a string containing no white space or quotes).
*/
- final Pattern argPattern = Pattern.compile("\"([^\"]+)\"|([^\"\\s]+)");
+ Pattern argPattern = Pattern.compile("\"([^\"]+)\"|([^\"\\s]+)");
- final Matcher matcher = argPattern.matcher(inputArgs);
- final List
* Subclass implementations might consume the next element as well.
+ *
* @param args
* @param slot
* @return next slot to be processed
- * @throws UserError if the user specified an option that requires a
- * value but provided no value (either the next command line element is
- * another option or there is no next element)
+ * @throws UserError if the user specified an option that requires a value but provided no value (either the next
+ * command line element is another option or there is no next element)
*/
int processValue(String[] args, int slot) throws UserError {
- /*
- * Ignore an argument that is just unquoted white space.
- */
- final Matcher m = whiteSpacePattern.matcher(args[slot]);
- if ( ! m.matches()) {
+
+ // Ignore an argument that is just unquoted white space.
+
+ if (!whiteSpacePattern.matcher(args[slot]).matches()) {
values.add(args[slot++]);
} else {
slot++;
}
+
return slot;
}
-
+
/**
- * Adds the command-line element to the Java agent arguments, if
- * appropriate.
+ * Adds the command-line element to the Java agent arguments, if appropriate.
*
* @param element
*/
@@ -469,6 +426,7 @@ void addToAgentArgs(final String element) {
/**
* Returns whether there is a next argument.
+ *
* @param args
* @param currentSlot
* @return
@@ -478,21 +436,19 @@ boolean isNextArg(String[] args, int currentSlot) {
}
/**
- * Returns the next argument in the array, without advancing
- * the pointer into the array.
+ * Returns the next argument in the array, without advancing the pointer into the array.
*
* @param args
* @param currentSlot
* @return
*/
- String nextArg(String[] args, int currentSlot){
+ String nextArg(String[] args, int currentSlot) {
return args[currentSlot + 1];
}
/**
- * Makes sure that there is a next argument and that its value does
- * not start with a "-" which would indicate an option, rather than
- * the value for the option we are currently processing.
+ * Makes sure that there is a next argument and that its value does not start with a "-" which would indicate an option,
+ * rather than the value for the option we are currently processing.
*
* @param args
* @param currentSlot
@@ -505,27 +461,23 @@ void ensureNonOptionNextArg(final String[] args, final int currentSlot) throws U
}
/**
- * Adds a representation for this command-line element to the output
- * command line.
+ * Adds a representation for this command-line element to the output command line.
*
* @param commandLine
- * @return true if any values from this command-line element
- * was added to the command line, false otherwise
+ * @return true if any values from this command-line element was added to the command line, false otherwise
*/
boolean format(final StringBuilder commandLine) {
return format(commandLine, true);
}
/**
- * Adds a representation for this command-line element to the output
- * command line, quoting the value if requested.
+ * Adds a representation for this command-line element to the output command line, quoting the value if requested.
*
* @param commandLine
* @param useQuotes
- * @return true if any values from this command-line element
- * were added to the command line; false otherwise
+ * @return true if any values from this command-line element were added to the command line; false otherwise
*/
- boolean format(final StringBuilder commandLine, boolean useQuotes) {
+ boolean format(StringBuilder commandLine, boolean useQuotes) {
boolean needSep = false;
for (String value : values) {
if (needSep) {
@@ -534,13 +486,14 @@ boolean format(final StringBuilder commandLine, boolean useQuotes) {
format(commandLine, useQuotes, value);
needSep = true;
}
- return ! values.isEmpty();
+
+ return !values.isEmpty();
}
/**
- * Returns the separator character to be inserted in the emitted
- * command line between values stored in the same instance of this
- * command line element.
+ * Returns the separator character to be inserted in the emitted command line between values stored in the same instance
+ * of this command line element.
+ *
* @return
*/
char valueSep() {
@@ -548,15 +501,14 @@ char valueSep() {
}
/**
- * Adds a representation for the specified value to the output
- * command line, quoting the value if required and
+ * Adds a representation for the specified value to the output command line, quoting the value if required and
+ *
* @param commandLine
* @param useQuotes
* @param v
* @return
*/
- StringBuilder format(final StringBuilder commandLine,
- final boolean useQuotes, final String v) {
+ StringBuilder format(StringBuilder commandLine, boolean useQuotes, String v) {
if (commandLine.length() > 0) {
commandLine.append(' ');
}
@@ -576,19 +528,16 @@ private class Option extends CommandLineElement {
}
/**
- * A JVM command-line option. Only JVM options which appear before the
- * main class setting are propagated to the output command line as
- * JVM options. If they appear after the main class setting then they
- * are treated as arguments to the client.
+ * A JVM command-line option. Only JVM options which appear before the main class setting are propagated to the output
+ * command line as JVM options. If they appear after the main class setting then they are treated as arguments to the
+ * client.
*
- * This type of command line element can include values specified using
- * the VMARGS environment variable.
+ * This type of command line element can include values specified using the VMARGS environment variable.
*
*/
private class JVMOption extends Option {
-
- JVMOption(final String patternString,
- final CommandLineElement vmargsJVMOptionElement) {
+
+ JVMOption(String patternString, CommandLineElement vmargsJVMOptionElement) {
super(patternString);
if (vmargsJVMOptionElement != null) {
values.addAll(vmargsJVMOptionElement.values);
@@ -596,26 +545,23 @@ private class JVMOption extends Option {
}
@Override
- boolean matches(final String element) {
+ boolean matches(String element) {
/*
- * Although the element might match the pattern (-.*) we do
- * not treat this as JVM option if we have already processed
+ * Although the element might match the pattern (-.*) we do not treat this as JVM option if we have already processed
* the main class determinant.
*/
- return ( ! jvmMainSetting.isSet()) && super.matches(element);
+ return (!jvmMainSetting.isSet()) && super.matches(element);
}
}
/**
- * ACC options match anywhere on the command line unless and until we
- * see "-jar xxx" in which case we impose the Java-style restriction that
- * anything which follows the specification of the main class is an
- * argument to be passed to the application.
+ * ACC options match anywhere on the command line unless and until we see "-jar xxx" in which case we impose the
+ * Java-style restriction that anything which follows the specification of the main class is an argument to be passed to
+ * the application.
*
- * We do not impose the same restriction if the user specified -client xxx.jar
- * in order to preserve backward compatibility with earlier releases, in
- * which ACC options and client arguments could be intermixed anywhere on
- * the command line.
+ * We do not impose the same restriction if the user specified -client xxx.jar in order to preserve backward
+ * compatibility with earlier releases, in which ACC options and client arguments could be intermixed anywhere on the
+ * command line.
*/
private class ACCUnvaluedOption extends Option {
ACCUnvaluedOption(final String patternString) {
@@ -623,22 +569,21 @@ private class ACCUnvaluedOption extends Option {
}
@Override
- boolean matches(final String element) {
- return ( ! jvmMainSetting.isJarSetting()) && super.matches(element);
+ boolean matches(String element) {
+ return (!jvmMainSetting.isJarSetting()) && super.matches(element);
}
@Override
int processValue(String[] args, int slot) throws UserError {
- final int result = super.processValue(args, slot);
+ int result = super.processValue(args, slot);
agentArgs.addACCArg(values.get(values.size() - 1));
return result;
}
@Override
- boolean format(final StringBuilder commandLine) {
+ boolean format(StringBuilder commandLine) {
/*
- * We do not send ACC arguments to the Java command line. They
- * are placed into the agent argument string instead.
+ * We do not send ACC arguments to the Java command line. They are placed into the agent argument string instead.
*/
return false;
}
@@ -664,7 +609,7 @@ class OptionValue {
ValuedOption(final String patternString) {
super(patternString);
}
-
+
@Override
int processValue(String[] args, int slot) throws UserError {
ensureNonOptionNextArg(args, slot);
@@ -672,21 +617,20 @@ int processValue(String[] args, int slot) throws UserError {
return slot;
}
-
+
@Override
boolean format(final StringBuilder commandLine) {
for (OptionValue ov : optValues) {
format(commandLine, false /* useQuotes */, ov.option);
format(commandLine, true /* useQuotes */, ov.value);
}
- return ! optValues.isEmpty();
+ return !optValues.isEmpty();
}
}
private class JVMValuedOption extends ValuedOption {
- JVMValuedOption(final String patternString,
- final CommandLineElement vmargsJVMValuedOption) {
+ JVMValuedOption(final String patternString, final CommandLineElement vmargsJVMValuedOption) {
super(patternString);
if (vmargsJVMValuedOption != null) {
values.addAll(vmargsJVMValuedOption.values);
@@ -695,7 +639,7 @@ private class JVMValuedOption extends ValuedOption {
@Override
boolean matches(final String element) {
- return ( ! jvmMainSetting.isJarSetting()) && super.matches(element);
+ return (!jvmMainSetting.isJarSetting()) && super.matches(element);
}
}
@@ -709,38 +653,36 @@ private class ACCValuedOption extends ValuedOption {
@Override
boolean matches(final String element) {
- return ( ! jvmMainSetting.isJarSetting()) && super.matches(element);
+ return (!jvmMainSetting.isJarSetting()) && super.matches(element);
}
@Override
int processValue(String[] args, int slot) throws UserError {
- final int result = super.processValue(args, slot);
- final OptionValue newOptionValue = optValues.get(optValues.size() - 1);
+ int result = super.processValue(args, slot);
+
+ OptionValue newOptionValue = optValues.get(optValues.size() - 1);
agentArgs.addACCArg(newOptionValue.option);
agentArgs.addACCArg(quote(newOptionValue.value));
+
return result;
}
@Override
boolean format(final StringBuilder commandLine) {
/*
- * We do not send ACC arguments to the Java command line. They
- * are placed into the agent argument string instead.
+ * We do not send ACC arguments to the Java command line. They are placed into the agent argument string instead.
*/
return false;
}
}
/**
- * Command line element(s) with which the user specified the client
- * to be run. Note that once "-jar xxx" is specified then all
- * subsequent arguments are passed to the client as arguments.
- * Once "-client xxx" is specified then subsequent arguments are treated
- * as ACC options (if they match) or arguments to the client.
+ * Command line element(s) with which the user specified the client to be run. Note that once "-jar xxx" is specified
+ * then all subsequent arguments are passed to the client as arguments. Once "-client xxx" is specified then subsequent
+ * arguments are treated as ACC options (if they match) or arguments to the client.
*/
private class JVMMainOption extends CommandLineElement {
- private static final String JVM_MAIN_PATTERN =
- "-jar|-client|[^-][^\\s]*";
+ private static final String JVM_MAIN_PATTERN = "-jar|-client|[^-][^\\s]*";
private String introducer = null;
@@ -757,23 +699,20 @@ boolean isClientSetting() {
}
boolean isClassSetting() {
- return ( ! isJarSetting() && ! isClientSetting() && isSet());
+ return (!isJarSetting() && !isClientSetting() && isSet());
}
boolean isSet() {
- return ! values.isEmpty();
+ return !values.isEmpty();
}
@Override
boolean matches(String element) {
/*
- * For backward compatibility, the -client element can appear
- * multiple times with the last appearance overriding earlier ones.
+ * For backward compatibility, the -client element can appear multiple times with the last appearance overriding earlier
+ * ones.
*/
- return (( ! isSet()) ||
- ( (isClientSetting() && element.equals("-client")))
- )
- && super.matches(element);
+ return ((!isSet()) || ((isClientSetting() && element.equals("-client")))) && super.matches(element);
}
@Override
@@ -784,9 +723,8 @@ int processValue(String[] args, int slot) throws UserError {
values.clear();
/*
- * If arg[slot] is -jar or -client we expect the
- * next value to be the file. Make sure there is
- * a next item and that it does not start with -.
+ * If arg[slot] is -jar or -client we expect the next value to be the file. Make sure there is a next item and that it
+ * does not start with -.
*/
if (args[slot].charAt(0) == '-') {
if (nextLooksOK(args, slot)) {
@@ -796,9 +734,8 @@ int processValue(String[] args, int slot) throws UserError {
final File clientSpec = new File(path);
if (clientSpec.isDirectory()) {
/*
- * Record in the agent args that the user is launching
- * a directory. Set the main class launch info to
- * launch the ACC JAR.
+ * Record in the agent args that the user is launching a directory. Set the main class launch info to launch the ACC
+ * JAR.
*/
agentArgs.add("client=dir=" + quote(clientSpec.getAbsolutePath()));
introducer = "-jar";
@@ -806,10 +743,8 @@ int processValue(String[] args, int slot) throws UserError {
} else {
agentArgs.add("client=jar=" + quote(path));
/*
- * The client path is not a directory. It should be a
- * .jar or a .ear file. If an EAR, then we want Java to
- * launch our ACC jar. If a JAR, then we will launch
- * that JAR.
+ * The client path is not a directory. It should be a .jar or a .ear file. If an EAR, then we want Java to launch our
+ * ACC jar. If a JAR, then we will launch that JAR.
*/
if (path.endsWith(".ear")) {
introducer = "-jar";
@@ -827,17 +762,16 @@ int processValue(String[] args, int slot) throws UserError {
final int result = super.processValue(args, slot);
agentArgs.add("client=class=" + values.get(values.size() - 1));
return result;
-
+
}
}
-
+
@Override
boolean format(final StringBuilder commandLine) {
if (introducer != null) {
/*
- * In the generated command we always use "-jar" to indicate
- * the JAR to be launched, even if the user specified "-client"
- * on the appclient command line.
+ * In the generated command we always use "-jar" to indicate the JAR to be launched, even if the user specified
+ * "-client" on the appclient command line.
*/
super.format(commandLine, false /* useQuotes */, "-jar");
return super.format(commandLine, true /* useQuotes */);
@@ -846,90 +780,78 @@ boolean format(final StringBuilder commandLine) {
}
private boolean nextLooksOK(final String[] args, final int slot) {
- return (isNextArg(args, slot) && (args[slot+1].charAt(0) != '-'));
+ return (isNextArg(args, slot) && (args[slot + 1].charAt(0) != '-'));
}
}
/**
- * A JVM option that uses values from the GlassFish installation plus default
- * value(s) from the Java installation. If the user specifies one of these
- * options on the command line then we discard the Java installation values
- * and append the GlassFish values to the user's values.
+ * A JVM option that uses values from the GlassFish installation plus default value(s) from the Java installation. If
+ * the user specifies one of these options on the command line then we discard the Java installation values and append
+ * the GlassFish values to the user's values.
*
- * This is used for handling java.ext.dirs and java.endorsed.dirs property
- * settings. If the user does not specify the property then the user would
- * expect the Java-provided directories to be used. We need to
- * specify the GlassFish ones, so that means we need combine the GlassFish
- * ones and the default JVM ones explicitly.
+ * This is used for handling java.ext.dirs and java.endorsed.dirs property settings. If the user does not specify the
+ * property then the user would expect the Java-provided directories to be used. We need to specify the GlassFish ones,
+ * so that means we need combine the GlassFish ones and the default JVM ones explicitly.
*
- * On the other hand, if the user specifies the property then the JVM
- * defaults are out of play. We still need the GlassFish directories to be
- * used though.
+ * On the other hand, if the user specifies the property then the JVM defaults are out of play. We still need the
+ * GlassFish directories to be used though.
*/
private class OverridableDefaultedPathBasedOption extends JVMOption {
private final String defaultValue;
private final List
* Note that we use the property acc._AS_INSTALL to find the installation.
*/
static class GlassFishInfo {
+
+ private static final String ACC_CONFIG_PREFIX = "domains/domain1/config";
private final File home;
private final File modules;
private final File lib;
private final File libAppclient;
- private static final String ACC_CONFIG_PREFIX = "domains/domain1/config";
GlassFishInfo() {
- final String asInstallPath = System.getProperty(ENV_VAR_PROP_PREFIX + "_AS_INSTALL");
+ String asInstallPath = System.getProperty(ENV_VAR_PROP_PREFIX + "_AS_INSTALL");
if (asInstallPath == null || asInstallPath.length() == 0) {
throw new IllegalArgumentException("_AS_INSTALL == null");
}
- this.home = new File(asInstallPath);
+
+ home = new File(asInstallPath);
modules = new File(home, "modules");
lib = new File(home, "lib");
libAppclient = new File(lib, "appclient");
@@ -1101,30 +1035,26 @@ File lib() {
}
File configxml() {
- /*
- * Try using glassfish-acc.xml. If that does not exist then the user
- * might have done an in-place upgrade from an earlier version that
- * used sun-acc.xml.
- */
- final File configXMLFile = new File(new File(home, ACC_CONFIG_PREFIX), "glassfish-acc.xml");
+ // Try using glassfish-acc.xml. If that does not exist then the user might have done an in-place upgrade from an earlier
+ // version that used sun-acc.xml.
+
+ File configXMLFile = new File(new File(home, ACC_CONFIG_PREFIX), "glassfish-acc.xml");
if (configXMLFile.canRead()) {
return configXMLFile;
}
- final File sunACCXMLFile = new File(new File(home, ACC_CONFIG_PREFIX), "sun-acc.xml");
+
+ File sunACCXMLFile = new File(new File(home, ACC_CONFIG_PREFIX), "sun-acc.xml");
if (sunACCXMLFile.canRead()) {
return sunACCXMLFile;
}
- /*
- * We found neither, but when an error is reported we want it to
- * report the glassfish-acc.xml file is missing.
- */
+
+
+ // We found neither, but when an error is reported we want it to report the glassfish-acc.xml file is missing.
return configXMLFile;
}
String[] endorsedPaths() {
- return new String[] {
- new File(lib, "endorsed").getAbsolutePath(),
- new File(modules, "endorsed").getAbsolutePath()};
+ return new String[] { new File(lib, "endorsed").getAbsolutePath(), new File(modules, "endorsed").getAbsolutePath() };
}
String extPaths() {
@@ -1143,46 +1073,31 @@ File loginConfig() {
return new File(libAppclient, "appclientlogin.conf");
}
}
-
- JavaInfo initJava() {
- return new JavaInfo();
- }
-
+
/**
* Collects information about the current Java implementation.
*
- * The user might have defined AS_JAVA or JAVA_HOME, or simply relied on
- * the current PATH setting to choose which Java to use. Regardless, once
- * this code is running SOME Java has been successfully chosen. Use
- * the java.home property to find the JRE's home, which we need for the
- * library directory (for example).
+ * The user might have defined AS_JAVA or JAVA_HOME, or simply relied on the current PATH setting to choose which Java
+ * to use. Regardless, once this code is running SOME Java has been successfully chosen. Use the java.home property to
+ * find the JRE's home, which we need for the library directory (for example).
*/
static class JavaInfo {
- private final static String CYGWIN_PROP_NAME = "org.glassfish.isCygwin";
- private final static String SHELL_PROP_NAME = "org.glassfish.appclient.shell";
+ private static final String SHELL_PROP_NAME = "org.glassfish.appclient.shell";
/*
- * The appclient and appclient.bat scripts set ACCJava.
- * Properties would be nicer instead of env vars, but the Windows
- * script handling of command line args in the for statement treats
- * the = in -Dprop=value as an argument separator and breaks the
- * property assignment apart into two arguments.
+ * The appclient and appclient.bat scripts set ACCJava. Properties would be nicer instead of env vars, but the Windows
+ * script handling of command line args in the for statement treats the = in -Dprop=value as an argument separator and
+ * breaks the property assignment apart into two arguments.
*/
- private final static String ACCJava_ENV_VAR_NAME = "ACCJava";
-
- private final boolean useWindowsSyntax = File.separatorChar == '\\' &&
- (System.getProperty(SHELL_PROP_NAME) == null);
+ private static final String ACCJava_ENV_VAR_NAME = "ACCJava";
+ private final boolean useWindowsSyntax = File.separatorChar == '\\' && (System.getProperty(SHELL_PROP_NAME) == null);
protected String javaExe;
protected File jreHome;
- private JavaInfo() {
- init();
- }
-
- private void init() {
+ JavaInfo() {
jreHome = new File(System.getProperty("java.home"));
javaExe = javaExe();
}
@@ -1217,20 +1132,17 @@ String pathSeparator() {
}
/**
- * Handles user-specified VM arguments passed by the environment variable
- * VMARGS.
+ * Handles user-specified VM arguments passed by the environment variable VMARGS.
*
- * This is very much like the handling of the arguments on the more
- * general command line, except that we expect only valid VM arguments
- * here.
+ * This is very much like the handling of the arguments on the more general command line, except that we expect only
+ * valid VM arguments here.
*
- * Some of the "main" CommandLineElements processed earlier in the class will
- * use the inner command line elements here to augment the values they process.
+ * Some of the "main" CommandLineElements processed earlier in the class will use the inner command line elements here
+ * to augment the values they process.
*/
class UserVMArgs {
- private CommandLineElement evExtDirs, evEndorsedDirs,
- evJVMPropertySettings, evJVMValuedOptions, evOtherJVMOptions;
+ private CommandLineElement evExtDirs, evEndorsedDirs, evJVMPropertySettings, evJVMValuedOptions, evOtherJVMOptions;
private final List