Skip to content

Commit 89eee25

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'server-template-keystore' into 'main'
Add server template keystores to discover and archive helper tools See merge request weblogic-cloud/weblogic-deploy-tooling!1792
2 parents 41cf616 + 83cb3d0 commit 89eee25

18 files changed

+1023
-44
lines changed

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/add/AddCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.tool.archive_helper.add;
@@ -31,6 +31,7 @@
3131
AddSaml2InitializationDataCommand.class,
3232
AddScriptCommand.class,
3333
AddServerKeystoreCommand.class,
34+
AddServerTemplateKeystoreCommand.class,
3435
AddSharedLibraryCommand.class,
3536
AddSharedLibraryPlanCommand.class,
3637
AddStructuredApplicationCommand.class,

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/add/AddServerTemplateKeystoreCommand.java

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
*/
5+
package oracle.weblogic.deploy.tool.archive_helper.add;
6+
7+
import oracle.weblogic.deploy.logging.PlatformLogger;
8+
import oracle.weblogic.deploy.logging.WLSDeployLogFactory;
9+
import oracle.weblogic.deploy.tool.archive_helper.ArchiveHelperException;
10+
import oracle.weblogic.deploy.tool.archive_helper.CommandResponse;
11+
import oracle.weblogic.deploy.util.ExitCode;
12+
import oracle.weblogic.deploy.util.WLSDeployArchive;
13+
import oracle.weblogic.deploy.util.WLSDeployArchiveIOException;
14+
import picocli.CommandLine.Command;
15+
import picocli.CommandLine.Option;
16+
17+
import java.io.File;
18+
19+
import static oracle.weblogic.deploy.tool.ArchiveHelper.LOGGER_NAME;
20+
21+
@Command(
22+
name = "serverTemplateKeystore",
23+
header = "Add a server template keystore to the archive file.",
24+
description = "%nCommand-line options:"
25+
)
26+
public class AddServerTemplateKeystoreCommand extends AddTypeCommandBase {
27+
private static final String CLASS = AddServerTemplateKeystoreCommand.class.getName();
28+
private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger(LOGGER_NAME);
29+
30+
@Option(
31+
names = {"-source"},
32+
paramLabel = "<path>",
33+
description = "File system path to the server template keystore to add",
34+
required = true
35+
)
36+
private String sourcePath;
37+
38+
@Option(
39+
names = {"-server_template_name"},
40+
paramLabel = "<server-template-name>",
41+
description = "WebLogic Server domain's server template name to use",
42+
required = true
43+
)
44+
private String serverTemplateName;
45+
46+
@Override
47+
public CommandResponse call() throws Exception {
48+
final String METHOD = "call";
49+
LOGGER.entering(CLASS, METHOD);
50+
51+
CommandResponse response;
52+
File sourceFile;
53+
try {
54+
sourceFile = initializeOptions(this.sourcePath);
55+
WLSDeployArchive.ArchiveEntryType archiveType = WLSDeployArchive.ArchiveEntryType.SERVER_TEMPLATE_KEYSTORE;
56+
57+
String resultName;
58+
if (this.overwrite) {
59+
resultName =
60+
this.archive.replaceSegregatedFile(archiveType, this.serverTemplateName, sourceFile.getName(), sourceFile.getPath());
61+
} else {
62+
resultName = this.archive.addSegregatedFile(archiveType, this.serverTemplateName, sourceFile.getPath());
63+
}
64+
response = new CommandResponse(ExitCode.OK, resultName);
65+
} catch (ArchiveHelperException ex) {
66+
LOGGER.severe("WLSDPLY-30063", ex, this.sourcePath, this.serverTemplateName,
67+
this.archiveFilePath, ex.getLocalizedMessage());
68+
response = new CommandResponse(ex.getExitCode(), "WLSDPLY-30063", this.sourcePath,
69+
this.serverTemplateName, this.archiveFilePath, ex.getLocalizedMessage());
70+
} catch (WLSDeployArchiveIOException | IllegalArgumentException ex) {
71+
LOGGER.severe("WLSDPLY-30064", ex, this.sourcePath, this.serverTemplateName,
72+
this.overwrite, this.archiveFilePath, ex.getLocalizedMessage());
73+
response = new CommandResponse(ExitCode.ERROR, "WLSDPLY-30064", this.sourcePath,
74+
this.serverTemplateName, this.overwrite, this.archiveFilePath, ex.getLocalizedMessage());
75+
}
76+
77+
LOGGER.exiting(CLASS, METHOD, response);
78+
return response;
79+
}
80+
}

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/extract/ExtractCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.tool.archive_helper.extract;
@@ -32,6 +32,7 @@
3232
ExtractSaml2InitializationDataCommand.class,
3333
ExtractScriptCommand.class,
3434
ExtractServerKeystoreCommand.class,
35+
ExtractServerTemplateKeystoreCommand.class,
3536
ExtractSharedLibraryCommand.class,
3637
ExtractSharedLibraryPlanCommand.class,
3738
ExtractStructuredApplicationCommand.class,

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/extract/ExtractServerTemplateKeystoreCommand.java

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
*/
5+
package oracle.weblogic.deploy.tool.archive_helper.extract;
6+
7+
import oracle.weblogic.deploy.logging.PlatformLogger;
8+
import oracle.weblogic.deploy.logging.WLSDeployLogFactory;
9+
import oracle.weblogic.deploy.tool.archive_helper.ArchiveHelperException;
10+
import oracle.weblogic.deploy.tool.archive_helper.CommandResponse;
11+
import oracle.weblogic.deploy.util.ExitCode;
12+
import oracle.weblogic.deploy.util.WLSDeployArchive;
13+
import oracle.weblogic.deploy.util.WLSDeployArchiveIOException;
14+
import picocli.CommandLine.Command;
15+
import picocli.CommandLine.Option;
16+
17+
import static oracle.weblogic.deploy.tool.ArchiveHelper.LOGGER_NAME;
18+
19+
@Command(
20+
name = "serverTemplateKeystore",
21+
header = "Extract server template keystore from the archive file.",
22+
description = "%nCommand-line options:"
23+
)
24+
public class ExtractServerTemplateKeystoreCommand extends ExtractTypeCommandBase {
25+
private static final String CLASS = ExtractServerTemplateKeystoreCommand.class.getName();
26+
private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger(LOGGER_NAME);
27+
private static final String TYPE = "server template keystore";
28+
private static final String ERROR_KEY = "WLSDPLY-30066";
29+
30+
@Option(
31+
names = {"-server_template_name"},
32+
description = "Name of the server template used to segregate the keystores in the archive file",
33+
required = true
34+
)
35+
private String serverTemplateName;
36+
37+
@Option(
38+
names = {"-name"},
39+
description = "Name of the server template keystore to be extracted from the archive file",
40+
required = true
41+
)
42+
private String name;
43+
44+
45+
@Override
46+
public CommandResponse call() throws Exception {
47+
final String METHOD = "call";
48+
LOGGER.entering(CLASS, METHOD);
49+
50+
CommandResponse response;
51+
try {
52+
initializeOptions();
53+
54+
WLSDeployArchive.ArchiveEntryType archiveType = WLSDeployArchive.ArchiveEntryType.SERVER_TEMPLATE_KEYSTORE;
55+
this.archive.extractSegregatedFile(archiveType, this.serverTemplateName, this.name, this.targetDirectory);
56+
response = new CommandResponse(ExitCode.OK, "WLSDPLY-30065", TYPE, this.name, this.serverTemplateName,
57+
this.archiveFilePath, this.targetDirectory.getPath());
58+
} catch (ArchiveHelperException ex) {
59+
LOGGER.severe(ERROR_KEY, ex, TYPE, this.name, this.serverTemplateName, this.archiveFilePath,
60+
this.targetDirectory.getPath(), ex.getLocalizedMessage());
61+
response = new CommandResponse(ex.getExitCode(), ERROR_KEY, TYPE, this.name, this.serverTemplateName,
62+
this.archiveFilePath, this.targetDirectory.getPath(), ex.getLocalizedMessage());
63+
} catch (WLSDeployArchiveIOException | IllegalArgumentException ex) {
64+
LOGGER.severe(ERROR_KEY, ex, TYPE, this.name, this.serverTemplateName, this.archiveFilePath,
65+
this.targetDirectory.getPath(), ex.getLocalizedMessage());
66+
response = new CommandResponse(ExitCode.ERROR, ERROR_KEY, TYPE, this.name, this.serverTemplateName,
67+
this.archiveFilePath, this.targetDirectory.getPath(), ex.getLocalizedMessage());
68+
}
69+
70+
LOGGER.exiting(CLASS, METHOD, response);
71+
return response;
72+
}
73+
}

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/list/ListCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.tool.archive_helper.list;
@@ -30,6 +30,7 @@
3030
ListSaml2InitializationDataCommand.class,
3131
ListScriptCommand.class,
3232
ListServerKeystoreCommand.class,
33+
ListServerTemplateKeystoreCommand.class,
3334
ListSharedLibraryCommand.class,
3435
ListStructuredApplicationCommand.class,
3536
ListWebLogicRemoteConsoleExtensionCommand.class,

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/list/ListServerTemplateKeystoreCommand.java

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
*/
5+
package oracle.weblogic.deploy.tool.archive_helper.list;
6+
7+
import oracle.weblogic.deploy.logging.PlatformLogger;
8+
import oracle.weblogic.deploy.logging.WLSDeployLogFactory;
9+
import oracle.weblogic.deploy.tool.archive_helper.CommandResponse;
10+
import picocli.CommandLine.Command;
11+
import picocli.CommandLine.Option;
12+
13+
import static oracle.weblogic.deploy.tool.ArchiveHelper.LOGGER_NAME;
14+
import static oracle.weblogic.deploy.util.WLSDeployArchive.ArchiveEntryType.SERVER_TEMPLATE_KEYSTORE;
15+
16+
@Command(
17+
name = "serverTemplateKeystore",
18+
header = "List server template keystore entries in the archive file.",
19+
description = "%nCommand-line options:"
20+
)
21+
public class ListServerTemplateKeystoreCommand extends ListTypeCommandBase {
22+
private static final String CLASS = ListServerTemplateKeystoreCommand.class.getName();
23+
private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger(LOGGER_NAME);
24+
25+
@Option(
26+
names = {"-server_template_name"},
27+
paramLabel = "<server-template-name>",
28+
description = "WebLogic Server domain's server template name to use",
29+
required = true
30+
)
31+
private String serverTemplateName;
32+
33+
@Option(
34+
names = { "-name" },
35+
paramLabel = "<name>",
36+
description = "Name of the keystore to list"
37+
)
38+
private String name;
39+
40+
@Override
41+
public CommandResponse call() throws Exception {
42+
final String METHOD = "call";
43+
LOGGER.entering(CLASS, METHOD);
44+
45+
CommandResponse response = listType(SERVER_TEMPLATE_KEYSTORE, "server template keystore", this.serverTemplateName, this.name);
46+
47+
LOGGER.exiting(CLASS, METHOD, response);
48+
return response;
49+
}
50+
}

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/remove/RemoveCommand.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, Oracle and/or its affiliates.
2+
* Copyright (c) 2023, 2025, Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
package oracle.weblogic.deploy.tool.archive_helper.remove;
@@ -31,6 +31,7 @@
3131
RemoveSaml2InitializationDataCommand.class,
3232
RemoveScriptCommand.class,
3333
RemoveServerKeystoreCommand.class,
34+
RemoveServerTemplateKeystoreCommand.class,
3435
RemoveSharedLibraryCommand.class,
3536
RemoveSharedLibraryPlanCommand.class,
3637
RemoveStructuredApplicationCommand.class,

‎core/src/main/java/oracle/weblogic/deploy/tool/archive_helper/remove/RemoveServerTemplateKeystoreCommand.java

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/*
2+
* Copyright (c) 2025, Oracle and/or its affiliates.
3+
* Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
4+
*/
5+
package oracle.weblogic.deploy.tool.archive_helper.remove;
6+
7+
import oracle.weblogic.deploy.logging.PlatformLogger;
8+
import oracle.weblogic.deploy.logging.WLSDeployLogFactory;
9+
import oracle.weblogic.deploy.tool.archive_helper.ArchiveHelperException;
10+
import oracle.weblogic.deploy.tool.archive_helper.CommandResponse;
11+
import oracle.weblogic.deploy.util.ExitCode;
12+
import oracle.weblogic.deploy.util.WLSDeployArchive;
13+
import oracle.weblogic.deploy.util.WLSDeployArchiveIOException;
14+
import picocli.CommandLine.Command;
15+
import picocli.CommandLine.Option;
16+
17+
import static oracle.weblogic.deploy.tool.ArchiveHelper.LOGGER_NAME;
18+
19+
@Command(
20+
name = "serverTemplateKeystore",
21+
header = "Remove server template keystore from the archive file.",
22+
description = "%nCommand-line options:"
23+
)
24+
public class RemoveServerTemplateKeystoreCommand extends RemoveTypeCommandBase {
25+
private static final String CLASS = RemoveServerTemplateKeystoreCommand.class.getName();
26+
private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger(LOGGER_NAME);
27+
private static final String TYPE = "server template keystore";
28+
29+
@Option(
30+
names = {"-server_template_name"},
31+
description = "Name of the server template used to segregate the keystores in the archive file",
32+
required = true
33+
)
34+
private String serverTemplateName;
35+
36+
@Option(
37+
names = {"-name"},
38+
description = "Name of the server template keystore to be removed from the archive file",
39+
required = true
40+
)
41+
private String name;
42+
43+
@Override
44+
public CommandResponse call() throws Exception {
45+
final String METHOD = "call";
46+
LOGGER.entering(CLASS, METHOD);
47+
48+
CommandResponse response;
49+
try {
50+
initializeOptions();
51+
52+
WLSDeployArchive.ArchiveEntryType archiveType = WLSDeployArchive.ArchiveEntryType.SERVER_TEMPLATE_KEYSTORE;
53+
int entriesRemoved;
54+
if (this.force) {
55+
entriesRemoved = this.archive.removeSegregatedFile(archiveType, this.serverTemplateName, this.name, true);
56+
} else {
57+
entriesRemoved = this.archive.removeSegregatedFile(archiveType, this.serverTemplateName, this.name);
58+
}
59+
response = new CommandResponse(ExitCode.OK, "WLSDPLY-30067", TYPE, this.serverTemplateName, this.name,
60+
entriesRemoved, this.archiveFilePath);
61+
} catch (ArchiveHelperException ex) {
62+
LOGGER.severe("WLSDPLY-30068", ex, this.serverTemplateName, this.name, this.archiveFilePath,
63+
ex.getLocalizedMessage());
64+
response = new CommandResponse(ex.getExitCode(), "WLSDPLY-30068", this.serverTemplateName,
65+
this.name, this.archiveFilePath, ex.getLocalizedMessage());
66+
} catch (WLSDeployArchiveIOException | IllegalArgumentException ex) {
67+
LOGGER.severe("WLSDPLY-30069", ex, this.serverTemplateName, this.name, this.force,
68+
this.archiveFilePath, ex.getLocalizedMessage());
69+
response = new CommandResponse(ExitCode.ERROR, "WLSDPLY-30069", this.serverTemplateName, this.name,
70+
this.force, this.archiveFilePath, ex.getLocalizedMessage());
71+
}
72+
73+
LOGGER.exiting(CLASS, METHOD, response);
74+
return response;
75+
}
76+
}

0 commit comments

Comments
 (0)