Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions opendj-server-legacy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,6 @@
<showDeprecation>false</showDeprecation>
<showWarnings>false</showWarnings>
<testCompilerArgument>-nowarn</testCompilerArgument>
<testExcludes>
<testExclude>**/org/opends/server/snmp/**</testExclude>
</testExcludes>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -1260,11 +1257,6 @@
<!-- <enableProcessChecker>all</enableProcessChecker>-->
<forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds>
<forkedProcessExitTimeoutInSeconds>120</forkedProcessExitTimeoutInSeconds>
<excludes>
<exclude>org/opends/server/snmp/**</exclude>
<exclude>org/opends/quicksetup/**</exclude>
<exclude>org/opends/quicksetup/**</exclude>
</excludes>
<includes>
<include>**/Test*.java</include>
<include>**/*Test.java</include>
Expand Down Expand Up @@ -1294,7 +1286,7 @@
<org.opends.server.BuildRoot>${basedir}</org.opends.server.BuildRoot>
<org.opends.server.BuildDir>${project.build.directory}</org.opends.server.BuildDir>
<org.opends.test.replicationDbImpl>LOG</org.opends.test.replicationDbImpl>
<jvmarg value="-Dorg.opends.server.snmp.opendmk=${opendmk.lib.dir}" />
<org.opends.server.snmp.opendmk>${opendmk.lib.dir}</org.opends.server.snmp.opendmk>
<org.opends.server.CleanupDirectories>true</org.opends.server.CleanupDirectories>
<org.opends.test.suppressOutput>true</org.opends.test.suppressOutput>
<org.opends.test.pauseOnFailure>false</org.opends.test.pauseOnFailure>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2011-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC
*/
package org.opends.quicksetup;

Expand Down Expand Up @@ -81,7 +82,6 @@ public final class Installation
/** The relative path to the current Configuration LDIF file. */
private static final String CURRENT_CONFIG_FILE_NAME = "config.ldif";
/** The relative path to the current Configuration LDIF file. */
private static final String BASE_CONFIG_FILE_PREFIX = "config.ldif.";
/** The relative path to the instance.loc file. */
public static final String INSTANCE_LOCATION_PATH_RELATIVE = "instance.loc";
/** The path to the instance.loc file. */
Expand Down Expand Up @@ -514,7 +514,9 @@ public File getBaseSchemaFile() throws ApplicationException
*/
public File getBaseConfigurationFile() throws ApplicationException
{
return new File(getConfigurationUpgradeDirectory(), BASE_CONFIG_FILE_PREFIX + getInstanceVCSRevision());
// Modern packages no longer ship a config.ldif.<revision> snapshot in
// config/upgrade: the pristine configuration lives in template/config.
return new File(new File(getTemplateDirectory(), CONFIG_PATH_RELATIVE), CURRENT_CONFIG_FILE_NAME);
}

/**
Expand Down Expand Up @@ -772,7 +774,9 @@ public File getQuicksetupJarFile()
*/
public File getOpenDSJarFile()
{
return new File(getLibrariesDirectory(), "OpenDJ.jar");
// The assembly packages the server jar as lowercase "opendj.jar"; the
// mixed-case name only appeared to work on case-insensitive file systems.
return new File(getLibrariesDirectory(), "opendj.jar");
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2006-2008 Sun Microsystems, Inc.
* Portions Copyright 2015 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC
*/
package org.opends.quicksetup;

Expand All @@ -26,7 +27,7 @@
* Configuration Tester.
*/
@SuppressWarnings("javadoc")
@Test(groups = {"slow"})
@Test(sequential=true)
public class ConfigurationTest extends QuickSetupTestCase {

private Configuration config;
Expand All @@ -36,51 +37,51 @@ public void setUp() throws Exception {
config = TestUtilities.getInstallation().getCurrentConfiguration();
}

@Test(enabled = false)
@Test
public void testGetDirectoryManagerDns() throws IOException {
Set<String> dns = config.getDirectoryManagerDns();
assertFalse(dns.isEmpty());
}

@Test(enabled = false)
@Test
public void testGetPort() throws IOException {
assertEquals(TestUtilities.ldapPort, (Integer) config.getPort());
}

@Test(enabled = false)
@Test
public void testGetLogPaths() throws IOException {
// TODO: something more useful
config.getLogPaths();
}

@Test(enabled = false)
@Test
public void testHasBeenModified() throws IOException {
assertTrue(config.hasBeenModified());
}

@Test(enabled = false)
@Test
public void testGetOutsideLogs() throws IOException {
// TODO: something more useful
config.getOutsideLogs();
}

@Test(enabled = false)
@Test
public void testGetOutsideDbs() throws IOException {
// TODO: something more useful
config.getOutsideDbs();
}

@Test(enabled = false)
@Test
public void testGetContents() throws IOException {
assertNotNull(config.getContents());
}

@Test(enabled = false)
@Test
public void testGetDatabasePaths() throws IOException {
assertFalse(config.getDatabasePaths().isEmpty());
}

@Test(enabled = false)
@Test
public void testLoad() {
//TODO: need way to verify reload
}
Expand Down
Loading
Loading