Juan Hernandez has uploaded a new change for review. Change subject: core: Move encryption utilities to utils ......................................................................
core: Move encryption utilities to utils We have only two utility classes in the engineencryptutils project, and they fit will in the utils project. Change-Id: I26a1583969ef714712a02e1da911a2e497c5799b Signed-off-by: Juan Hernandez <[email protected]> --- M Makefile M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java M backend/manager/modules/bll/src/test/resources/log4j.xml M backend/manager/modules/dal/pom.xml M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMapTest.java D backend/manager/modules/engineencryptutils/pom.xml D backend/manager/modules/engineencryptutils/src/test/java/ca.der D backend/manager/modules/engineencryptutils/src/test/java/ca.pfx D backend/manager/modules/engineencryptutils/src/test/resources/key.p12 D backend/manager/modules/engineencryptutils/src/test/resources/log4j.xml M backend/manager/modules/pom.xml M backend/manager/modules/root/pom.xml M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java M backend/manager/modules/utils/pom.xml R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/EncryptionUtilsTest.java R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java M backend/manager/modules/utils/src/test/resources/log4j.xml M backend/manager/tools/pom.xml M backend/manager/tools/src/main/conf/engine-config-log4j.xml M backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java M backend/manager/tools/src/main/shell/engine-config.sh M backend/manager/tools/src/main/shell/engine-manage-domains.sh M backend/manager/tools/src/main/shell/engine-notifier.sh M ear/pom.xml M packaging/fedora/spec/ovirt-engine.spec.in 35 files changed, 20 insertions(+), 146 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/11924/1 diff --git a/Makefile b/Makefile index 3a72350..c964c86 100644 --- a/Makefile +++ b/Makefile @@ -80,7 +80,6 @@ compat \ dal \ tools \ - engineencryptutils \ interface-common-jaxrs \ manager \ manager-modules \ @@ -104,7 +103,6 @@ $(PKG_EAR_DIR)/lib/engine-common,common \ $(PKG_EAR_DIR)/lib/engine-compat,compat \ $(PKG_EAR_DIR)/lib/engine-dal,dal \ - $(PKG_EAR_DIR)/lib/engine-encryptutils,engineencryptutils \ $(PKG_EAR_DIR)/lib/engine-tools,tools \ $(PKG_EAR_DIR)/lib/engine-utils,utils \ $(PKG_EAR_DIR)/lib/engine-vdsbroker,vdsbroker \ diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java index ca0edd1..41e13fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsDeploy.java @@ -27,10 +27,10 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.engineencryptutils.OpenSSHUtils; import org.ovirt.engine.core.utils.LocalConfig; import org.ovirt.engine.core.utils.NetworkUtils; import org.ovirt.engine.core.utils.archivers.tar.CachedTar; +import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; import org.ovirt.engine.core.utils.hostinstall.OpenSslCAWrapper; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java index 254b18e..8e47d88 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServersForImportQuery.java @@ -18,8 +18,8 @@ import org.ovirt.engine.core.dal.VdcBllMessages; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.VdsStaticDAO; -import org.ovirt.engine.core.engineencryptutils.OpenSSHUtils; import org.ovirt.engine.core.utils.XmlUtils; +import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; import org.ovirt.engine.core.utils.ssh.ConstraintByteArrayOutputStream; import org.ovirt.engine.core.utils.ssh.SSHClient; import org.w3c.dom.Element; diff --git a/backend/manager/modules/bll/src/test/resources/log4j.xml b/backend/manager/modules/bll/src/test/resources/log4j.xml index b56066c..ea6c7e8 100644 --- a/backend/manager/modules/bll/src/test/resources/log4j.xml +++ b/backend/manager/modules/bll/src/test/resources/log4j.xml @@ -302,7 +302,7 @@ </category> <!--Encrypt utils--> - <category name="org.ovirt.engine.core.engineencryptutils"> + <category name="org.ovirt.engine.core.utils.crypt"> <priority value="INFO"/> </category> diff --git a/backend/manager/modules/dal/pom.xml b/backend/manager/modules/dal/pom.xml index 04d9d59..3b00315 100644 --- a/backend/manager/modules/dal/pom.xml +++ b/backend/manager/modules/dal/pom.xml @@ -44,11 +44,6 @@ </dependency> <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>engineencryptutils</artifactId> - <version>${engine.version}</version> - </dependency> - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>common</artifactId> <version>${engine.version}</version> </dependency> diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java index 7042f2a..559f4cb 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/DbFacadeUtils.java @@ -8,7 +8,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java index 7fa8cc1..53d406b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java @@ -16,7 +16,7 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.VdcOptionDAO; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.ConfigUtilsBase; import org.ovirt.engine.core.utils.log.Log; import org.ovirt.engine.core.utils.log.LogFactory; diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java index 49c952c..afeba52 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMap.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Set; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class DomainsPasswordMap implements Map<String, String> { diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMapTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMapTest.java index 27d0284..67abbb1 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMapTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/generic/DomainsPasswordMapTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class DomainsPasswordMapTest { diff --git a/backend/manager/modules/engineencryptutils/pom.xml b/backend/manager/modules/engineencryptutils/pom.xml deleted file mode 100644 index 1685671..0000000 --- a/backend/manager/modules/engineencryptutils/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.ovirt.engine.core</groupId> - <artifactId>manager-modules</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> - - <artifactId>engineencryptutils</artifactId> - <packaging>jar</packaging> - - <name>Encryption Libraries</name> - - <dependencies> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <additionalClasspathElements> - <additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/backend/manager/modules/engineencryptutils/src/test/java/ca.der b/backend/manager/modules/engineencryptutils/src/test/java/ca.der deleted file mode 100644 index 694b42f..0000000 --- a/backend/manager/modules/engineencryptutils/src/test/java/ca.der +++ /dev/null @@ -1,35 +0,0 @@ -Bag Attributes - localKeyID: 66 D4 4D EF 75 BA 69 E0 72 47 3D A4 FB 16 C3 38 A4 19 6C 80 -subject=/C=IL/O=RedHat/CN=VDC -issuer=/C=IL/O=RedHat/CN=VDC ------BEGIN CERTIFICATE----- -MIICATCCAWqgAwIBAgIBATANBgkqhkiG9w0BAQQFADAsMQswCQYDVQQGEwJJTDEP -MA0GA1UEChMGUmVkSGF0MQwwCgYDVQQDEwNWREMwHhcNMDkwNTMwMDAwMDAwWhcN -MTkwNTMwMTUyMzEzWjAsMQswCQYDVQQGEwJJTDEPMA0GA1UEChMGUmVkSGF0MQww -CgYDVQQDEwNWREMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPNJs6OQLL+f -nB64CdUOiVQVkUdpn5BbXrLLQr9O7HpUojo5bwLQlqibg8DKMhFmZGSDXzoGDUUV -Mjod6N7bQzo11AqDzJREtLT8i6zaXopx1qQqHOjrbBeYiiCyCe0/xDemvHVvO+8O -CE/NPttIM6YSFMnRYizw0NF2GUPsEDUNAgMBAAGjMzAxMC8GCCsGAQUFBwEBBCMw -ITAfBggrBgEFBQcwAoYTaHR0cDovL215LmNhL2NhLmNydDANBgkqhkiG9w0BAQQF -AAOBgQCZ/1rq6jzZCPwUMvvE4zWfTV+r6CnAnpMvx6Yabj4oIdsYk4HhyEBkl43Q -2p2e5/cnEOrRBZFCWy+Of+4Fecd5XatYZJcM72MjTHdcUbnbEyeEqYUFbdGLiQPd -p8SyAdLazkq/1iw8xHI+O1TM/iVofFWKB2Ng1AFNXf3EWzAHeA== ------END CERTIFICATE----- -Bag Attributes - localKeyID: 66 D4 4D EF 75 BA 69 E0 72 47 3D A4 FB 16 C3 38 A4 19 6C 80 -Key Attributes: <No Attributes> ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDzSbOjkCy/n5weuAnVDolUFZFHaZ+QW16yy0K/Tux6VKI6OW8C -0Jaom4PAyjIRZmRkg186Bg1FFTI6Heje20M6NdQKg8yURLS0/Ius2l6KcdakKhzo -62wXmIogsgntP8Q3prx1bzvvDghPzT7bSDOmEhTJ0WIs8NDRdhlD7BA1DQIDAQAB -AoGAN4JEa3hUzW/0ZgnlrGgBq160ZA/UaVJ/m9nGo/G1AQBYd2JtUr4W8edxu0Yn -AFNVap2S16FT28RHTn1OibKLdsW3OZOBqXIJIXDISv5c3SK40ReVe6WtBrBnXHQQ -/KHC1CjNfeWGLUgGScIrKdLuc4qWIHW0stP2gK8suXh8vgECQQD8kfBfODFFY3r6 -w2j/2qwXE4OR9VOTwDYfQ9iCWHSjeRpkyXCibDhTVZkivxNbwyjYQ/0p9egNanaK -ZPhJZ2aBAkEA9pd+RF4zpdHPIFi65aDuKebTi80QeBGRs+2IYVFG+6mrzsCwsAxJ -7R/x4JnFC7aoP6AF2xbdJR55F5xiazzAjQJAbVpmf2Od+ZQLz/zBPl2YOtmJEq3s -RMFo7Xp7iFvyDEFHyzFoYfqHHJWoGuIt6IID8jblqsA8e2qH7n2u/mEVgQJBAKmg -iJFLI8gbTZn4r4gqbeqRCFCQ3ZVasJnO+hPHr0aK7s6oqmJP8cKWSPKxlGR8X7x0 -vdJ6JeHU1oOxZdpSzjkCQQCjtyfdfp/YMH8uDkYPMfJg3rPMmmiBulT5LgYpkmpH -lIbBxVnlUnD4VaGjnC4oKnwF9/GlfxdVjdI4bnn9/jy8 ------END RSA PRIVATE KEY----- diff --git a/backend/manager/modules/engineencryptutils/src/test/java/ca.pfx b/backend/manager/modules/engineencryptutils/src/test/java/ca.pfx deleted file mode 100644 index eb27450..0000000 --- a/backend/manager/modules/engineencryptutils/src/test/java/ca.pfx +++ /dev/null Binary files differ diff --git a/backend/manager/modules/engineencryptutils/src/test/resources/key.p12 b/backend/manager/modules/engineencryptutils/src/test/resources/key.p12 deleted file mode 100644 index 2ee9979..0000000 --- a/backend/manager/modules/engineencryptutils/src/test/resources/key.p12 +++ /dev/null Binary files differ diff --git a/backend/manager/modules/engineencryptutils/src/test/resources/log4j.xml b/backend/manager/modules/engineencryptutils/src/test/resources/log4j.xml deleted file mode 100644 index 52cab77..0000000 --- a/backend/manager/modules/engineencryptutils/src/test/resources/log4j.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/> - <param name="Target" value="System.out"/> - <layout class="org.apache.log4j.PatternLayout"> - <!-- The default pattern: Date Priority [Category] Message\n --> - <param name="ConversionPattern" value="%-5p [%c{6}] %m%n"/> - </layout> - </appender> - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml index 21a1de9..c8ee4c4 100644 --- a/backend/manager/modules/pom.xml +++ b/backend/manager/modules/pom.xml @@ -15,7 +15,6 @@ <modules> <module>compat</module> - <module>engineencryptutils</module> <module>utils</module> <module>common</module> <module>dal</module> diff --git a/backend/manager/modules/root/pom.xml b/backend/manager/modules/root/pom.xml index 50e918f..53a78ca 100644 --- a/backend/manager/modules/root/pom.xml +++ b/backend/manager/modules/root/pom.xml @@ -46,13 +46,6 @@ <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>engineencryptutils</artifactId> - <version>${engine.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>utils</artifactId> <version>${engine.version}</version> <scope>provided</scope> diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java index 0b8cfe0..ea78c44 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java @@ -14,7 +14,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; -import org.ovirt.engine.core.engineencryptutils.OpenSSHUtils; +import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; /** * Send PKI resource. diff --git a/backend/manager/modules/utils/pom.xml b/backend/manager/modules/utils/pom.xml index e72aadc..8440718 100644 --- a/backend/manager/modules/utils/pom.xml +++ b/backend/manager/modules/utils/pom.xml @@ -65,12 +65,6 @@ <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>engineencryptutils</artifactId> - <version>${engine.version}</version> - </dependency> - - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>common</artifactId> <version>${engine.version}</version> </dependency> diff --git a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java similarity index 98% rename from backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java index 5d12248..b3b36f5 100644 --- a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EncryptionUtils.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.engineencryptutils; +package org.ovirt.engine.core.utils.crypt; import java.io.File; import java.io.FileInputStream; diff --git a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java similarity index 98% rename from backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtils.java rename to backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java index e8f4d8a..ee7d587 100644 --- a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtils.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.engineencryptutils; +package org.ovirt.engine.core.utils.crypt; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java index 44986ef..446fb5f 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/EngineSSHDialog.java @@ -14,7 +14,7 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.engineencryptutils.OpenSSHUtils; +import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; /** * SSH dialog to be used with engine defaults diff --git a/backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/EncryptionUtilsTest.java similarity index 98% rename from backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtilsTest.java rename to backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/EncryptionUtilsTest.java index cb214b2..7ca56d7 100644 --- a/backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtilsTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/EncryptionUtilsTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.engineencryptutils; +package org.ovirt.engine.core.utils.crypt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java similarity index 99% rename from backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtilsTest.java rename to backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java index 16d4f19..016d968 100644 --- a/backend/manager/modules/engineencryptutils/src/test/java/org/ovirt/engine/core/engineencryptutils/OpenSSHUtilsTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.core.engineencryptutils; +package org.ovirt.engine.core.utils.crypt; import static org.junit.Assert.assertEquals; diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java index 57fe5ba..3505516 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java @@ -33,7 +33,7 @@ import org.apache.commons.lang.SystemUtils; -import org.ovirt.engine.core.engineencryptutils.OpenSSHUtils; +import org.ovirt.engine.core.utils.crypt.OpenSSHUtils; /* * Test properties diff --git a/backend/manager/modules/utils/src/test/resources/log4j.xml b/backend/manager/modules/utils/src/test/resources/log4j.xml index 0970ff0..c5c36d9 100644 --- a/backend/manager/modules/utils/src/test/resources/log4j.xml +++ b/backend/manager/modules/utils/src/test/resources/log4j.xml @@ -130,7 +130,7 @@ </category> <!--Encrypt utils--> - <category name="org.ovirt.engine.engineencryptutils"> + <category name="org.ovirt.engine.utils.crypt"> <priority value="INFO"/> </category> diff --git a/backend/manager/tools/pom.xml b/backend/manager/tools/pom.xml index b5c4c7c..ca8925e 100644 --- a/backend/manager/tools/pom.xml +++ b/backend/manager/tools/pom.xml @@ -44,12 +44,6 @@ <dependency> <groupId>${engine.groupId}</groupId> - <artifactId>engineencryptutils</artifactId> - <version>${engine.version}</version> - </dependency> - - <dependency> - <groupId>${engine.groupId}</groupId> <artifactId>utils</artifactId> <version>${engine.version}</version> </dependency> diff --git a/backend/manager/tools/src/main/conf/engine-config-log4j.xml b/backend/manager/tools/src/main/conf/engine-config-log4j.xml index 0c2b913..dff6837 100644 --- a/backend/manager/tools/src/main/conf/engine-config-log4j.xml +++ b/backend/manager/tools/src/main/conf/engine-config-log4j.xml @@ -32,7 +32,7 @@ <level value="INFO"/> </logger> - <logger name="org.ovirt.engine.core.engineencryptutils"> + <logger name="org.ovirt.engine.core.utils.crypt"> <level value="FATAL"/> </logger> diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java index 0c2cbd0..d3297cd 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java @@ -12,7 +12,7 @@ import org.ovirt.engine.core.config.db.ConfigDAO; import org.ovirt.engine.core.config.entity.ConfigKey; import org.ovirt.engine.core.config.entity.ConfigKeyFactory; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class PasswordValueHelper implements ValueHelper { private static ConfigDAO configDAO; diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java index 9ac5669..2a87948 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java @@ -37,11 +37,11 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.config.ConfigCommon; import org.ovirt.engine.core.common.config.ConfigValues; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; import org.ovirt.engine.core.notifier.utils.NotificationConfigurator; import org.ovirt.engine.core.notifier.utils.NotificationProperties; import org.ovirt.engine.core.tools.common.db.StandaloneDataSource; import org.ovirt.engine.core.utils.LocalConfig; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; import org.ovirt.engine.core.utils.db.DbUtils; /** diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java index 5a0bf9e..29193b6 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/tools/common/db/StandaloneDataSource.java @@ -16,7 +16,7 @@ import javax.sql.DataSource; import org.apache.log4j.Logger; -import org.ovirt.engine.core.engineencryptutils.EncryptionUtils; +import org.ovirt.engine.core.utils.crypt.EncryptionUtils; public class StandaloneDataSource implements DataSource { // The log: diff --git a/backend/manager/tools/src/main/shell/engine-config.sh b/backend/manager/tools/src/main/shell/engine-config.sh index e89ad09..d2ce524 100755 --- a/backend/manager/tools/src/main/shell/engine-config.sh +++ b/backend/manager/tools/src/main/shell/engine-config.sh @@ -99,8 +99,8 @@ apache-commons-logging \ log4j \ ovirt-engine/compat \ -ovirt-engine/engineencryptutils \ ovirt-engine/tools \ +ovirt-engine/utils \ postgresql-jdbc \ ` diff --git a/backend/manager/tools/src/main/shell/engine-manage-domains.sh b/backend/manager/tools/src/main/shell/engine-manage-domains.sh index 5f9bdec..ae10d9c 100755 --- a/backend/manager/tools/src/main/shell/engine-manage-domains.sh +++ b/backend/manager/tools/src/main/shell/engine-manage-domains.sh @@ -103,7 +103,6 @@ log4j \ ovirt-engine/common \ ovirt-engine/compat \ -ovirt-engine/engineencryptutils \ ovirt-engine/tools \ ovirt-engine/utils \ postgresql-jdbc \ diff --git a/backend/manager/tools/src/main/shell/engine-notifier.sh b/backend/manager/tools/src/main/shell/engine-notifier.sh index 3db69c7..5815edc 100755 --- a/backend/manager/tools/src/main/shell/engine-notifier.sh +++ b/backend/manager/tools/src/main/shell/engine-notifier.sh @@ -188,7 +188,6 @@ log4j ovirt-engine/common ovirt-engine/compat - ovirt-engine/engineencryptutils ovirt-engine/tools ovirt-engine/utils postgresql-jdbc diff --git a/ear/pom.xml b/ear/pom.xml index f0caeb6..9e7eb2a 100644 --- a/ear/pom.xml +++ b/ear/pom.xml @@ -223,12 +223,6 @@ <jarModule> <groupId>org.ovirt.engine.core</groupId> - <artifactId>engineencryptutils</artifactId> - <bundleFileName>engine-encryptutils.jar</bundleFileName> - </jarModule> - - <jarModule> - <groupId>org.ovirt.engine.core</groupId> <artifactId>vdsbroker</artifactId> <bundleFileName>engine-vdsbroker.jar</bundleFileName> </jarModule> diff --git a/packaging/fedora/spec/ovirt-engine.spec.in b/packaging/fedora/spec/ovirt-engine.spec.in index 787c3c0..e2b21e5 100644 --- a/packaging/fedora/spec/ovirt-engine.spec.in +++ b/packaging/fedora/spec/ovirt-engine.spec.in @@ -588,7 +588,6 @@ # Jar files: %{engine_java}/bll.jar %{engine_java}/dal.jar -%{engine_java}/engineencryptutils.jar %{engine_java}/scheduler.jar %{engine_java}/searchbackend.jar %{engine_java}/vdsbroker.jar @@ -601,7 +600,6 @@ %{_mavenpomdir}/JPP.%{name}-tools.pom %{_mavenpomdir}/JPP.%{name}-bll.pom %{_mavenpomdir}/JPP.%{name}-dal.pom -%{_mavenpomdir}/JPP.%{name}-engineencryptutils.pom %{_mavenpomdir}/JPP.%{name}-scheduler.pom %{_mavenpomdir}/JPP.%{name}-searchbackend.pom %{_mavenpomdir}/JPP.%{name}-vdsbroker.pom -- To view, visit http://gerrit.ovirt.org/11924 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26a1583969ef714712a02e1da911a2e497c5799b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
