Alon Bar-Lev has uploaded a new change for review.
Change subject: utils: introduce universal utilities (uutils)
......................................................................
utils: introduce universal utilities (uutils)
a package of packages that may be split out of engine, not directly
related to engine and can be split even to own jars.
this will enable components that should not pull the engine 'common'
part to enjoy these utilities.
Change-Id: Ibb5dab40276b3363dbd8f2bbba15933b67c5f220
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M Makefile
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java
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/utils/EngineSSHClient.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHDialog.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
M backend/manager/modules/builtin-extensions/pom.xml
M
backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java
M
backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
M backend/manager/modules/pom.xml
M backend/manager/modules/utils/pom.xml
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
M
backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
A backend/manager/modules/uutils/exclude-filters.xml
A backend/manager/modules/uutils/pom.xml
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/Argument.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilder.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParser.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStream.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressInputStream.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressOutputStream.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHClient.java
R
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHDialog.java
A
backend/manager/modules/uutils/src/main/modules/org/ovirt/engine/core/uutils/main/module.xml
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilderTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParserTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/BasicTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/CommandTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStreamTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtilsTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/PropertiesTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHD.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHDialogTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TestCommon.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TimeoutTest.java
R
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TransferTest.java
A backend/manager/modules/uutils/src/test/resources/key.p12
M
backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
M ear/src/main/resources/META-INF/MANIFEST.MF
M ovirt-engine.spec.in
43 files changed, 182 insertions(+), 61 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/26924/1
diff --git a/Makefile b/Makefile
index 6fb4748..b9567c3 100644
--- a/Makefile
+++ b/Makefile
@@ -355,6 +355,7 @@
install -m 644 backend/manager/modules/scheduler/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-scheduler.pom"
install -m 644 backend/manager/modules/searchbackend/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-searchbackend.pom"
install -m 644 backend/manager/modules/utils/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-utils.pom"
+ install -m 644 backend/manager/modules/uutils/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-uutils.pom"
install -m 644 backend/manager/modules/vdsbroker/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-vdsbroker.pom"
install -m 644 backend/manager/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-manager.pom"
install -m 644 backend/manager/tools/pom.xml
"$(DESTDIR)$(MAVENPOM_DIR)/$(PACKAGE_NAME)-tools.pom"
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
index 36a05c0..c200bc2 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
@@ -50,11 +50,11 @@
import org.ovirt.engine.core.dal.job.ExecutionMessageDirector;
import org.ovirt.engine.core.dao.gluster.GlusterDBUtils;
import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils;
-import org.ovirt.engine.core.utils.ssh.ConstraintByteArrayOutputStream;
-import org.ovirt.engine.core.utils.ssh.SSHClient;
import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
import org.ovirt.engine.core.utils.transaction.TransactionSupport;
+import org.ovirt.engine.core.uutils.ssh.ConstraintByteArrayOutputStream;
+import org.ovirt.engine.core.uutils.ssh.SSHClient;
@NonTransactiveCommandAttribute(forceCompensation = true)
public class AddVdsCommand<T extends AddVdsActionParameters> extends
VdsCommand<T> {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java
index e6b4d2d..c9fcd4e 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OVirtNodeUpgrade.java
@@ -17,7 +17,7 @@
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.ssh.SSHDialog;
+import org.ovirt.engine.core.uutils.ssh.SSHDialog;
/**
* ovirt-node upgrade.
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 53101e9..201c3ee 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
@@ -45,9 +45,9 @@
import org.ovirt.engine.core.utils.linq.Predicate;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.ssh.SSHDialog;
import org.ovirt.engine.core.utils.transaction.TransactionMethod;
import org.ovirt.engine.core.utils.transaction.TransactionSupport;
+import org.ovirt.engine.core.uutils.ssh.SSHDialog;
import org.ovirt.otopi.constants.BaseEnv;
import org.ovirt.otopi.constants.Confirms;
import org.ovirt.otopi.constants.CoreEnv;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java
index b5dc928..4e18c44 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHClient.java
@@ -14,8 +14,8 @@
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils;
-import org.ovirt.engine.core.utils.crypt.OpenSSHUtils;
-import org.ovirt.engine.core.utils.ssh.SSHClient;
+import org.ovirt.engine.core.uutils.ssh.OpenSSHUtils;
+import org.ovirt.engine.core.uutils.ssh.SSHClient;
/**
* SSH client to be used with engine defaults
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHDialog.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHDialog.java
index cef1f73..1de57bd 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHDialog.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/EngineSSHDialog.java
@@ -7,10 +7,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils;
-import org.ovirt.engine.core.utils.ssh.SSHClient;
-import org.ovirt.engine.core.utils.ssh.SSHDialog;
import org.ovirt.engine.core.common.businessentities.VDS;
+import org.ovirt.engine.core.utils.crypt.EngineEncryptionUtils;
+import org.ovirt.engine.core.uutils.ssh.SSHClient;
+import org.ovirt.engine.core.uutils.ssh.SSHDialog;
/**
* SSH dialog to be used with engine defaults
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
index 508a114..eeb2461 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
@@ -37,8 +37,8 @@
import org.ovirt.engine.core.utils.lock.LockManagerFactory;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.ssh.ConstraintByteArrayOutputStream;
-import org.ovirt.engine.core.utils.ssh.SSHClient;
+import org.ovirt.engine.core.uutils.ssh.ConstraintByteArrayOutputStream;
+import org.ovirt.engine.core.uutils.ssh.SSHClient;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/backend/manager/modules/builtin-extensions/pom.xml
b/backend/manager/modules/builtin-extensions/pom.xml
index fbc60fb..d5a5947 100644
--- a/backend/manager/modules/builtin-extensions/pom.xml
+++ b/backend/manager/modules/builtin-extensions/pom.xml
@@ -32,6 +32,11 @@
</dependency>
<dependency>
<groupId>${engine.groupId}</groupId>
+ <artifactId>uutils</artifactId>
+ <version>${engine.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${engine.groupId}</groupId>
<artifactId>aaa</artifactId>
<version>${engine.version}</version>
</dependency>
diff --git
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java
index 5fbcceb..59c570e 100644
---
a/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java
+++
b/backend/manager/modules/builtin-extensions/src/main/java/org/ovirt/engine/extensions/aaa/builtin/tools/ManageDomainsArguments.java
@@ -11,8 +11,8 @@
import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.ldap.LdapProviderType;
import org.ovirt.engine.core.utils.EngineLocalConfig;
-import org.ovirt.engine.core.utils.cli.ArgumentBuilder;
-import org.ovirt.engine.core.utils.cli.ExtendedCliParser;
+import org.ovirt.engine.core.uutils.cli.ArgumentBuilder;
+import org.ovirt.engine.core.uutils.cli.ExtendedCliParser;
/**
* Class for command line arguments parsing and validation
diff --git
a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
index c62b7fa..0f492d8 100644
---
a/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
+++
b/backend/manager/modules/builtin-extensions/src/main/modules/org/ovirt/engine/extensions/builtin/main/module.xml
@@ -18,6 +18,7 @@
<module name="org.ovirt.engine.core.common"/>
<module name="org.ovirt.engine.core.compat"/>
<module name="org.ovirt.engine.core.utils"/>
+ <module name="org.ovirt.engine.core.uutils"/>
<module name="org.springframework"/>
<module name="sun.jdk"/>
diff --git a/backend/manager/modules/pom.xml b/backend/manager/modules/pom.xml
index 8417fbf..d4938c8 100644
--- a/backend/manager/modules/pom.xml
+++ b/backend/manager/modules/pom.xml
@@ -16,6 +16,7 @@
<modules>
<module>extensions-api-root</module>
+ <module>uutils</module>
<module>compat</module>
<module>utils</module>
<module>common</module>
diff --git a/backend/manager/modules/utils/pom.xml
b/backend/manager/modules/utils/pom.xml
index daf3b1c..736f01f 100644
--- a/backend/manager/modules/utils/pom.xml
+++ b/backend/manager/modules/utils/pom.xml
@@ -30,18 +30,6 @@
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina-core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- <version>${sshd-core.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.ovirt.otopi</groupId>
<artifactId>otopi</artifactId>
<version>${otopi.version}</version>
@@ -56,6 +44,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${engine.groupId}</groupId>
+ <artifactId>uutils</artifactId>
+ <version>${engine.version}</version>
</dependency>
<dependency>
@@ -172,9 +166,6 @@
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/src/test/java</additionalClasspathElement>
</additionalClasspathElements>
- <excludes>
- <exclude>**/ssh/*.java</exclude>
- </excludes>
</configuration>
</plugin>
@@ -186,13 +177,6 @@
</plugins>
</build>
<profiles>
- <profile>
- <id>enable-ssh-tests</id>
- <properties>
- <test>**/ssh/*.java</test>
- </properties>
- </profile>
-
<profile>
<id>findbugs</id>
<activation>
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
index 0263801..ff028b7 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
@@ -11,7 +11,7 @@
import org.apache.commons.codec.binary.Base64;
-import org.ovirt.engine.core.utils.crypt.OpenSSHUtils;
+import org.ovirt.engine.core.uutils.ssh.OpenSSHUtils;
public class PKIResources {
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
index 30a962c..279e90b 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
@@ -19,6 +19,7 @@
import org.ovirt.engine.core.common.config.Config;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.utils.EngineLocalConfig;
+import org.ovirt.engine.core.uutils.ssh.OpenSSHUtils;
public class EngineEncryptionUtils {
diff --git
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
index d1c12ae..33b75f0 100644
---
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
+++
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
@@ -19,12 +19,12 @@
<module name="org.apache.commons.lang"/>
<module name="org.apache.commons.logging"/>
<module name="org.apache.log4j"/>
- <module name="org.apache.sshd"/>
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.ovirt.engine.core.common"/>
<module name="org.ovirt.engine.core.compat"/>
<module name="org.ovirt.engine.core.dal"/>
+ <module name="org.ovirt.engine.core.uutils"/>
<module name="org.infinispan"/>
<module name="org.springframework"/>
<module name="org.postgresql"/>
diff --git a/backend/manager/modules/uutils/exclude-filters.xml
b/backend/manager/modules/uutils/exclude-filters.xml
new file mode 100644
index 0000000..43bc332
--- /dev/null
+++ b/backend/manager/modules/uutils/exclude-filters.xml
@@ -0,0 +1,2 @@
+<FindBugsFilter>
+</FindBugsFilter>
diff --git a/backend/manager/modules/uutils/pom.xml
b/backend/manager/modules/uutils/pom.xml
new file mode 100644
index 0000000..6e6db23
--- /dev/null
+++ b/backend/manager/modules/uutils/pom.xml
@@ -0,0 +1,106 @@
+<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.5.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>uutils</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Universal utilities</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>${sshd-core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <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>
+ <excludes>
+ <exclude>**/ssh/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!-- Create the JBoss module: -->
+ <plugin>
+ <groupId>org.ovirt.engine</groupId>
+ <artifactId>jboss-modules-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>enable-ssh-tests</id>
+ <properties>
+ <test>**/ssh/*.java</test>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>findbugs</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <!-- Optional directory to put findbugs xdoc xml
report -->
+ <excludeFilterFile>
${basedir}/exclude-filters.xml</excludeFilterFile>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>findbugs-general</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>${findbugs.version}</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <!-- Optional directory to put findbugs xdoc xml
report -->
+ <excludeFilterFile> ${basedir}/exclude-filters.xml,
${basedir}/../../../../exclude-filters-general.xml</excludeFilterFile>
+ <xmlOutputDirectory>target/site</xmlOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/Argument.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/Argument.java
similarity index 94%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/Argument.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/Argument.java
index 4d15785..760cbef 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/Argument.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/Argument.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.cli;
+package org.ovirt.engine.core.uutils.cli;
/**
* Represents argument specification inside {@link ExtendedCliParser}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ArgumentBuilder.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilder.java
similarity index 97%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ArgumentBuilder.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilder.java
index 1215973..b1dee48 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ArgumentBuilder.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilder.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.cli;
+package org.ovirt.engine.core.uutils.cli;
import org.apache.commons.lang.StringUtils;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ExtendedCliParser.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParser.java
similarity index 99%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ExtendedCliParser.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParser.java
index 79e172f..9f55994 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/cli/ExtendedCliParser.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParser.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.cli;
+package org.ovirt.engine.core.uutils.cli;
import java.util.HashMap;
import java.util.Map;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStream.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStream.java
similarity index 95%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStream.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStream.java
index a4601db..c6302c5 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStream.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStream.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.ByteArrayOutputStream;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
similarity index 98%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
index ff7cc6e..0820685 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtils.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtils.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.crypt;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressInputStream.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressInputStream.java
similarity index 95%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressInputStream.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressInputStream.java
index efa3919..620c4cc 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressInputStream.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressInputStream.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.FilterInputStream;
import java.io.IOException;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressOutputStream.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressOutputStream.java
similarity index 94%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressOutputStream.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressOutputStream.java
index 4b64575..6f4d46e 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/ProgressOutputStream.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/ProgressOutputStream.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.FilterOutputStream;
import java.io.IOException;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHClient.java
similarity index 99%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHClient.java
index 9c9026b..860678f 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHClient.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHClient.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHDialog.java
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHDialog.java
similarity index 99%
rename from
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHDialog.java
rename to
backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHDialog.java
index 4abab39..6a32f80 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ssh/SSHDialog.java
+++
b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/ssh/SSHDialog.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
diff --git
a/backend/manager/modules/uutils/src/main/modules/org/ovirt/engine/core/uutils/main/module.xml
b/backend/manager/modules/uutils/src/main/modules/org/ovirt/engine/core/uutils/main/module.xml
new file mode 100644
index 0000000..c8b8b95
--- /dev/null
+++
b/backend/manager/modules/uutils/src/main/modules/org/ovirt/engine/core/uutils/main/module.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.1" name="org.ovirt.engine.core.uutils">
+
+ <resources>
+ <resource-root path="uutils.jar"/>
+ </resources>
+
+ <dependencies>
+ <module name="javax.api"/>
+ <module name="org.apache.commons.codec"/>
+ <module name="org.apache.commons.lang"/>
+ <module name="org.apache.commons.logging"/>
+ <module name="org.apache.sshd"/>
+ </dependencies>
+
+</module>
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ArgumentBuilderTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilderTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ArgumentBuilderTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilderTest.java
index f2d72a3..cff4c92 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ArgumentBuilderTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ArgumentBuilderTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.cli;
+package org.ovirt.engine.core.uutils.cli;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ExtendedCliParserTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParserTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ExtendedCliParserTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParserTest.java
index 1a23912..50599c5 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/cli/ExtendedCliParserTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/cli/ExtendedCliParserTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.cli;
+package org.ovirt.engine.core.uutils.cli;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -6,7 +6,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.ovirt.engine.core.utils.cli.ExtendedCliParser.VALUE_SEP_LONG;
+import static
org.ovirt.engine.core.uutils.cli.ExtendedCliParser.VALUE_SEP_LONG;
import java.util.Map;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/BasicTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/BasicTest.java
index 668e0a0..4781d73 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/BasicTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/BasicTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertEquals;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/CommandTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/CommandTest.java
index f9f7ae0..8b207e7 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/CommandTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/CommandTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStreamTest.java
similarity index 93%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStreamTest.java
index bb42d6d..f39fdb7 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/ConstraintByteArrayOutputStreamTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/ConstraintByteArrayOutputStreamTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertTrue;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtilsTest.java
similarity index 99%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtilsTest.java
index 016d968..a648678 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/crypt/OpenSSHUtilsTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/OpenSSHUtilsTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.crypt;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertEquals;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/PropertiesTest.java
similarity index 95%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/PropertiesTest.java
index 84b0fd8..65ce7e3 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/PropertiesTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/PropertiesTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.IOException;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHD.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHD.java
index efbc70f..b7319bb 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHD.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHD.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import java.io.IOException;
import java.security.KeyPair;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHDialogTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHDialogTest.java
index 3e85e7e..3445279 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/SSHDialogTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/SSHDialogTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -32,8 +32,6 @@
import org.junit.Test;
import org.apache.commons.lang.SystemUtils;
-
-import org.ovirt.engine.core.utils.crypt.OpenSSHUtils;
/*
* Test properties
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TestCommon.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TestCommon.java
index 7be04d6..d8beaef 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TestCommon.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TestCommon.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
/*
* Example of execution:
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TimeoutTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TimeoutTest.java
index 04b8914..5143024 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TimeoutTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TimeoutTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TransferTest.java
similarity index 98%
rename from
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java
rename to
backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TransferTest.java
index f006092..c62ca1c 100644
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ssh/TransferTest.java
+++
b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/ssh/TransferTest.java
@@ -1,4 +1,4 @@
-package org.ovirt.engine.core.utils.ssh;
+package org.ovirt.engine.core.uutils.ssh;
import static org.junit.Assert.assertArrayEquals;
diff --git a/backend/manager/modules/uutils/src/test/resources/key.p12
b/backend/manager/modules/uutils/src/test/resources/key.p12
new file mode 100644
index 0000000..2ee9979
--- /dev/null
+++ b/backend/manager/modules/uutils/src/test/resources/key.p12
Binary files differ
diff --git
a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
index 3f5fa07..47de050 100644
---
a/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
+++
b/backend/manager/tools/src/main/modules/org/ovirt/engine/core/tools/main/module.xml
@@ -17,6 +17,7 @@
<module name="org.ovirt.engine.core.common"/>
<module name="org.ovirt.engine.core.compat"/>
<module name="org.ovirt.engine.core.utils"/>
+ <module name="org.ovirt.engine.core.uutils"/>
<module name="org.postgresql"/>
<module name="org.snmp4j"/>
<module name="sun.jdk"/>
diff --git a/ear/src/main/resources/META-INF/MANIFEST.MF
b/ear/src/main/resources/META-INF/MANIFEST.MF
index 28e6f0a..4a982d6 100644
--- a/ear/src/main/resources/META-INF/MANIFEST.MF
+++ b/ear/src/main/resources/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@
org.ovirt.engine.core.dal,
org.ovirt.engine.core.searchbackend,
org.ovirt.engine.core.utils,
+ org.ovirt.engine.core.uutils,
org.ovirt.otopi,
org.ovirt.ovirt-host-deploy,
org.ovirt.engine.core.aaa,
diff --git a/ovirt-engine.spec.in b/ovirt-engine.spec.in
index 3777ce4..4c93c57 100644
--- a/ovirt-engine.spec.in
+++ b/ovirt-engine.spec.in
@@ -586,6 +586,7 @@
%{engine_jboss_modules}/org/ovirt/engine/core/searchbackend/main/searchbackend.jar
%{engine_jboss_modules}/org/ovirt/engine/core/tools/main/tools.jar
%{engine_jboss_modules}/org/ovirt/engine/core/utils/main/utils.jar
+%{engine_jboss_modules}/org/ovirt/engine/core/uutils/main/uutils.jar
%{engine_jboss_modules}/org/ovirt/engine/extensions/builtin/main/builtin.jar
%{engine_restapi_war}/WEB-INF/lib/interface-common-jaxrs.jar
%{engine_restapi_war}/WEB-INF/lib/restapi-definition.jar
@@ -791,6 +792,7 @@
%{engine_java}/extensions-manager.jar
%{engine_java}/ovirt-engine-extensions-api.jar
%{engine_java}/utils.jar
+%{engine_java}/uutils.jar
#
# ATTENTION:
@@ -807,6 +809,7 @@
%{_mavenpomdir}/JPP.%{name}-common.pom
%{_mavenpomdir}/JPP.%{name}-compat.pom
%{_mavenpomdir}/JPP.%{name}-utils.pom
+%{_mavenpomdir}/JPP.%{name}-uutils.pom
%endif
%files lib
--
To view, visit http://gerrit.ovirt.org/26924
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb5dab40276b3363dbd8f2bbba15933b67c5f220
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
