Skip to content

Commit

Permalink
Internationalization removed from ProcessManager
Browse files Browse the repository at this point in the history
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

# Conflicts:
#	nucleus/admin/server-mgmt/src/main/java/com/sun/enterprise/admin/servermgmt/cli/StopDomainCommand.java
#	nucleus/cluster/cli/src/main/java/com/sun/enterprise/admin/cli/cluster/StopLocalInstanceCommand.java
#	nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/LocalStrings.properties
#	nucleus/common/common-util/src/main/java/com/sun/enterprise/universal/process/ProcessUtils.java
  • Loading branch information
dmatej committed Dec 11, 2022
1 parent 83e5907 commit 088fe16
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 78 deletions.

This file was deleted.

Expand Up @@ -120,7 +120,7 @@ public int execute() throws ProcessManagerException {
return process.exitValue();
} catch (IllegalThreadStateException tse) {
// this means that the process is still running...
throw new ProcessManagerTimeoutException(tse);
throw new ProcessManagerTimeoutException("Process is still running.", tse);
}
} catch (ProcessManagerException pme) {
throw pme;
Expand Down Expand Up @@ -159,7 +159,7 @@ private void writeStdin(Process process) throws ProcessManagerException {
return;
}
if (process == null) {
throw new ProcessManagerException(Strings.get("null.process"));
throw new ProcessManagerException("Parameter process was null.");
}
try (PrintWriter pipe = new PrintWriter(new BufferedWriter(new OutputStreamWriter(process.getOutputStream())))) {
for (String stdinLine : stdinLines) {
Expand Down Expand Up @@ -192,7 +192,7 @@ private void await(Process process) throws InterruptedException, ProcessManagerE

private void waitForever(Process process) throws InterruptedException, ProcessManagerException {
if (process == null) {
throw new ProcessManagerException(Strings.get("null.process"));
throw new ProcessManagerException("Parameter process was null.");
}
process.waitFor();
}
Expand Down
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -14,21 +15,31 @@
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
*/

/*
package com.sun.enterprise.universal.process;

/**
* ProcessManagerException.java
* Any errors in ProcessManager will cause this to be thrown
*
* @since JDK 1.4
* @author bnevins
* Created on October 28, 2005, 10:08 PM
* @author bnevins 2005
*/
package com.sun.enterprise.universal.process;

public class ProcessManagerException extends Exception {

private static final long serialVersionUID = -4175171348489033516L;


public ProcessManagerException(Throwable cause) {
super(cause);
}


public ProcessManagerException(String message) {
super(message);
}


public ProcessManagerException(String message, Throwable cause) {
super(message, cause);
}
}
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 2009, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -18,7 +19,9 @@

public class ProcessManagerTimeoutException extends ProcessManagerException {

public ProcessManagerTimeoutException(Throwable cause) {
super(cause);
private static final long serialVersionUID = -634378999869311994L;

public ProcessManagerTimeoutException(String message, Throwable cause) {
super(message, cause);
}
}

This file was deleted.

@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022 Contributors to the Eclipse Foundation
* Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
Expand All @@ -18,9 +19,6 @@

public class CommandException extends Exception {

/**
*
*/
private static final long serialVersionUID = 1L;

/**
Expand Down

0 comments on commit 088fe16

Please sign in to comment.